From 4a275ec3259817118d93ada1ab947c75cef28284 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 11 May 2026 17:59:58 -0400
Subject: [PATCH 01/14] old bot commands

---
 code/controllers/subsystem/ticker.dm                  |  6 +++++-
 code/modules/discord/tgs_commands.dm                  |  2 +-
 config/apoc_config.txt                                |  2 ++
 .../code/controllers/configuration/entries/general.dm |  2 ++
 modular_zapoc/modules/discord/tgs_commands.dm         | 11 +++++++++++
 tgstation.dme                                         |  2 ++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 config/apoc_config.txt
 create mode 100644 modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
 create mode 100644 modular_zapoc/modules/discord/tgs_commands.dm

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index d0d7ccc37a81..376048b57481 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -151,7 +151,11 @@ SUBSYSTEM_DEF(ticker)
 				window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
 			to_chat(world, span_notice("<b>Welcome to [station_name()]!</b>"))
 			for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
-				send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
+				if(SSticker.GetTimeLeft() == -10) // APOC EDIT CHANGE START - DISCORD
+					send2chat(new /datum/tgs_message_content("New round delayed. Thanks for playing Apocrypha XIII!"), channel_tag) // APOC EDIT CHANGE
+				else
+					send2chat(new /datum/tgs_message_content("<@&1474327242510303336> New round starting on [SSmapping.config.map_name]!"), channel_tag)
+				// APOC EDIT CHANGE END
 			current_state = GAME_STATE_PREGAME
 			SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)
 
diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index 6903bf7dcc65..6d22c9c59b22 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -4,7 +4,7 @@
 
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients)] (Active: [get_active_player_count(0,1,0)]), Map: [SSmapping.config.map_name], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
 
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"
diff --git a/config/apoc_config.txt b/config/apoc_config.txt
new file mode 100644
index 000000000000..04429ad80286
--- /dev/null
+++ b/config/apoc_config.txt
@@ -0,0 +1,2 @@
+## NICE images for COOL discord users, seperated by commas i.e. BITE_IMG_LIST http://url/image.gif, http://url/image.png
+# BITE_IMG_LIST
diff --git a/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm b/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
new file mode 100644
index 000000000000..c42cd57bdd26
--- /dev/null
+++ b/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
@@ -0,0 +1,2 @@
+/datum/config_entry/string/bite_img_list // APOC EDIT START
+	config_entry_value = "No bites for you."
diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/modules/discord/tgs_commands.dm
new file mode 100644
index 000000000000..0021ff05d9c2
--- /dev/null
+++ b/modular_zapoc/modules/discord/tgs_commands.dm
@@ -0,0 +1,11 @@
+// APOC EDIT START - obviously // fangfuckies :3
+/datum/tgs_chat_command/fangfuckies // Friend
+	name = "fangfuckies"
+	help_text = "Posts a random biting gif (0.1% chance for an ultra-rare bonus gif.)"
+
+/datum/tgs_chat_command/fangfuckies/Run(datum/tgs_chat_user/sender, params)
+	var/random_image = splittext(CONFIG_GET(string/bite_img_list), ", ") // comma + space delimiter
+	if(prob(0.1))
+		return new /datum/tgs_message_content("https://images2.imgbox.com/de/57/LouUHBzY_o.gif") // sneefer
+
+	return new /datum/tgs_message_content("[pick(random_image)]")
diff --git a/tgstation.dme b/tgstation.dme
index 747a494f82f0..0385d4d1b7ba 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7879,6 +7879,7 @@
 #include "modular_darkpack\modules\westfield_mall\code\modular_rooms.dm"
 #include "modular_darkpack\modules\z_travel\code\manhole.dm"
 #include "modular_darkpack\modules\z_travel\code\transfer_point.dm"
+#include "modular_zapoc\master_files\code\controllers\configuration\entries\general.dm"
 #include "modular_zapoc\master_files\code\game\objects\structures\stairs.dm"
 #include "modular_zapoc\modules\areas\code\areas.dm"
 #include "modular_zapoc\modules\areas\code\voivodate.dm"
@@ -7897,6 +7898,7 @@
 #include "modular_zapoc\modules\decor\code\man_crystal.dm"
 #include "modular_zapoc\modules\decor\code\superhigh_railing.dm"
 #include "modular_zapoc\modules\decor\code\torch.dm"
+#include "modular_zapoc\modules\discord\tgs_commands.dm"
 #include "modular_zapoc\modules\gray_masses\code\gray_core.dm"
 #include "modular_zapoc\modules\gray_masses\code\gray_man.dm"
 #include "modular_zapoc\modules\gray_masses\code\tall_gray_man.dm"

From 42f59af77f5ff17f43761a793c6fcb19173513d5 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 11 May 2026 18:14:30 -0400
Subject: [PATCH 02/14] var change

---
 code/controllers/subsystem/ticker.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 376048b57481..e0b33e2afa39 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -154,7 +154,7 @@ SUBSYSTEM_DEF(ticker)
 				if(SSticker.GetTimeLeft() == -10) // APOC EDIT CHANGE START - DISCORD
 					send2chat(new /datum/tgs_message_content("New round delayed. Thanks for playing Apocrypha XIII!"), channel_tag) // APOC EDIT CHANGE
 				else
-					send2chat(new /datum/tgs_message_content("<@&1474327242510303336> New round starting on [SSmapping.config.map_name]!"), channel_tag)
+					send2chat(new /datum/tgs_message_content("<@&1474327242510303336> New round starting on [station_name()]!"), channel_tag)
 				// APOC EDIT CHANGE END
 			current_state = GAME_STATE_PREGAME
 			SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)

From 9fef7a38fe5d7196a19c51260fac82da50713099 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 11 May 2026 18:17:04 -0400
Subject: [PATCH 03/14] ???

---
 code/modules/discord/tgs_commands.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index 6d22c9c59b22..4ff42cef2e3f 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -4,7 +4,7 @@
 
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients)] (Active: [get_active_player_count(0,1,0)]), Map: [SSmapping.config.map_name], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
 
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"

From 73ff8991e57ef3f0d00b0d52fb71981d58cd5348 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 11 May 2026 18:22:19 -0400
Subject: [PATCH 04/14] soft revert

---
 code/modules/discord/tgs_commands.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index 4ff42cef2e3f..de9473495e02 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -4,8 +4,9 @@
 
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
-
+//	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")
+#warn fix this when the upstream pull is merged
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"
 	help_text = "Gets the version details from the show-server-revision verb, basically"

From beeb1e6473a89162fcb9c441c646ec287d723761 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Thu, 11 Jun 2026 20:20:02 -0400
Subject: [PATCH 05/14] ok just uncomment ig

---
 code/modules/discord/tgs_commands.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index de9473495e02..4ff42cef2e3f 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -4,9 +4,8 @@
 
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-//	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")
-#warn fix this when the upstream pull is merged
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
+
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"
 	help_text = "Gets the version details from the show-server-revision verb, basically"

From d64192410695dd0e34063326806b5da007bc6c1a Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Wed, 24 Jun 2026 10:32:42 -0400
Subject: [PATCH 06/14] ok let's try this

---
 code/modules/discord/tgs_commands.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index 4ff42cef2e3f..7765d8840064 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -1,11 +1,11 @@
 /datum/tgs_chat_command/tgscheck
 	name = "check"
 	help_text = "Gets the playercount, gamemode, and address of the server"
-
+/* APOC EDIT REMOVE - DISCORD
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
-
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")
+*/ // APOC EDIT REMOVE END - DISCORD
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"
 	help_text = "Gets the version details from the show-server-revision verb, basically"

From 72c6a9c04f6c0d6e4b04434f8a96daf34ddea23e Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 29 Jun 2026 12:38:46 -0400
Subject: [PATCH 07/14] i forgot

---
 modular_zapoc/modules/discord/tgs_commands.dm | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/modules/discord/tgs_commands.dm
index 0021ff05d9c2..8730f23d325e 100644
--- a/modular_zapoc/modules/discord/tgs_commands.dm
+++ b/modular_zapoc/modules/discord/tgs_commands.dm
@@ -1,4 +1,32 @@
-// APOC EDIT START - obviously // fangfuckies :3
+/datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
+	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
+	var/round_status = "delayed"
+
+	switch(SSticker.current_state)
+		if(GAME_STATE_STARTUP)
+			round_status = "initializing"
+		if(GAME_STATE_PREGAME)
+			round_status = "pre-game"
+		if(GAME_STATE_SETTING_UP)
+			round_status = "starting"
+		if(GAME_STATE_PLAYING)
+			round_status = "active -- Join now! [server]"
+		if(GAME_STATE_FINISHED)
+			round_status = "restarting"
+
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [round_status] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
+
+/datum/controller/subsystem/ticker/proc/HasRoundStarted()
+	return current_state >= GAME_STATE_PLAYING
+
+///Whether the game is currently in progress, excluding roundend
+/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
+	return current_state == GAME_STATE_PLAYING
+
+///Whether the game is currently in progress, excluding roundend
+/datum/controller/subsystem/ticker/proc/IsPostgame()
+	return current_state == GAME_STATE_FINISHED
+
 /datum/tgs_chat_command/fangfuckies // Friend
 	name = "fangfuckies"
 	help_text = "Posts a random biting gif (0.1% chance for an ultra-rare bonus gif.)"

From c670c2548cadb47ca83f874679492e2265227894 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 29 Jun 2026 12:39:34 -0400
Subject: [PATCH 08/14] yt

---
 modular_zapoc/modules/discord/tgs_commands.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/modules/discord/tgs_commands.dm
index 8730f23d325e..3b832cdeab37 100644
--- a/modular_zapoc/modules/discord/tgs_commands.dm
+++ b/modular_zapoc/modules/discord/tgs_commands.dm
@@ -10,11 +10,11 @@
 		if(GAME_STATE_SETTING_UP)
 			round_status = "starting"
 		if(GAME_STATE_PLAYING)
-			round_status = "active -- Join now! [server]"
+			round_status = "active -- Join now!"
 		if(GAME_STATE_FINISHED)
 			round_status = "restarting"
 
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [round_status] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [round_status] -- [server]") // APOC EDIT CHANGE - DISCORD
 
 /datum/controller/subsystem/ticker/proc/HasRoundStarted()
 	return current_state >= GAME_STATE_PLAYING

From 77976abd9eae72455d41c333631ba655fa086497 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Mon, 29 Jun 2026 13:41:47 -0400
Subject: [PATCH 09/14] oop

---
 modular_zapoc/modules/discord/tgs_commands.dm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/modules/discord/tgs_commands.dm
index 3b832cdeab37..41090054aee2 100644
--- a/modular_zapoc/modules/discord/tgs_commands.dm
+++ b/modular_zapoc/modules/discord/tgs_commands.dm
@@ -16,17 +16,6 @@
 
 	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [round_status] -- [server]") // APOC EDIT CHANGE - DISCORD
 
-/datum/controller/subsystem/ticker/proc/HasRoundStarted()
-	return current_state >= GAME_STATE_PLAYING
-
-///Whether the game is currently in progress, excluding roundend
-/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
-	return current_state == GAME_STATE_PLAYING
-
-///Whether the game is currently in progress, excluding roundend
-/datum/controller/subsystem/ticker/proc/IsPostgame()
-	return current_state == GAME_STATE_FINISHED
-
 /datum/tgs_chat_command/fangfuckies // Friend
 	name = "fangfuckies"
 	help_text = "Posts a random biting gif (0.1% chance for an ultra-rare bonus gif.)"

From 92435803f92d196bfe7dc9105c1ce84e7fb1a37b Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Tue, 30 Jun 2026 19:33:11 -0400
Subject: [PATCH 10/14] ok

---
 modular_zapoc/modules/discord/tgs_commands.dm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/modules/discord/tgs_commands.dm
index 41090054aee2..b395b17399a5 100644
--- a/modular_zapoc/modules/discord/tgs_commands.dm
+++ b/modular_zapoc/modules/discord/tgs_commands.dm
@@ -1,20 +1,24 @@
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
-	var/round_status = "delayed"
+	var/round_status
+	var/timeleft = SSticker.GetTimeLeft()
 
 	switch(SSticker.current_state)
 		if(GAME_STATE_STARTUP)
-			round_status = "initializing"
+			round_status = "Round Initializing"
 		if(GAME_STATE_PREGAME)
-			round_status = "pre-game"
+			round_status = "Pre-Game"
 		if(GAME_STATE_SETTING_UP)
-			round_status = "starting"
+			round_status = "Round Starting"
 		if(GAME_STATE_PLAYING)
-			round_status = "active -- Join now!"
+			round_status = "Active -- Join now!"
 		if(GAME_STATE_FINISHED)
-			round_status = "restarting"
+			round_status = "Round Restarting"
 
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [round_status] -- [server]") // APOC EDIT CHANGE - DISCORD
+	if(timeleft == -10)
+		round_status = "Round Delayed -- Thanks for playing!"
+
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], [round_status] -- [server]")
 
 /datum/tgs_chat_command/fangfuckies // Friend
 	name = "fangfuckies"

From 143bc95058a49a6a73c8f20f52576153e6ae4525 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Tue, 30 Jun 2026 19:40:29 -0400
Subject: [PATCH 11/14] comment

---
 .../code/controllers/configuration/entries/general.dm           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm b/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
index c42cd57bdd26..9ec94fb94c4f 100644
--- a/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
+++ b/modular_zapoc/master_files/code/controllers/configuration/entries/general.dm
@@ -1,2 +1,2 @@
-/datum/config_entry/string/bite_img_list // APOC EDIT START
+/datum/config_entry/string/bite_img_list
 	config_entry_value = "No bites for you."

From d2c49c15d77acc133fb0cb7a0026e068a9b49cd8 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Sat, 25 Jul 2026 17:55:36 -0400
Subject: [PATCH 12/14] sorry abby

---
 code/controllers/subsystem/ticker.dm                          | 2 +-
 code/modules/discord/tgs_commands.dm                          | 4 ++--
 .../{ => master_files/code}/modules/discord/tgs_commands.dm   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename modular_zapoc/{ => master_files/code}/modules/discord/tgs_commands.dm (90%)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 1e833d16d1d0..9ccb93ffd706 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -132,7 +132,7 @@ SUBSYSTEM_DEF(ticker)
 			to_chat(world, span_notice("<b>Welcome to [station_name()]!</b>"))
 			for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
 				if(SSticker.GetTimeLeft() == -10) // APOC EDIT CHANGE START - DISCORD
-					send2chat(new /datum/tgs_message_content("New round delayed. Thanks for playing Apocrypha XIII!"), channel_tag) // APOC EDIT CHANGE
+					send2chat(new /datum/tgs_message_content("New round delayed. Thanks for playing [CONFIG_GET(string/servername)]"), channel_tag) // APOC EDIT CHANGE
 				else
 					send2chat(new /datum/tgs_message_content("<@&1474327242510303336> New round starting on [station_name()]!"), channel_tag)
 				// APOC EDIT CHANGE END
diff --git a/code/modules/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index 7765d8840064..6903bf7dcc65 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -1,11 +1,11 @@
 /datum/tgs_chat_command/tgscheck
 	name = "check"
 	help_text = "Gets the playercount, gamemode, and address of the server"
-/* APOC EDIT REMOVE - DISCORD
+
 /datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
 	var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
 	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")
-*/ // APOC EDIT REMOVE END - DISCORD
+
 /datum/tgs_chat_command/gameversion
 	name = "gameversion"
 	help_text = "Gets the version details from the show-server-revision verb, basically"
diff --git a/modular_zapoc/modules/discord/tgs_commands.dm b/modular_zapoc/master_files/code/modules/discord/tgs_commands.dm
similarity index 90%
rename from modular_zapoc/modules/discord/tgs_commands.dm
rename to modular_zapoc/master_files/code/modules/discord/tgs_commands.dm
index b395b17399a5..96ebf4afd718 100644
--- a/modular_zapoc/modules/discord/tgs_commands.dm
+++ b/modular_zapoc/master_files/code/modules/discord/tgs_commands.dm
@@ -18,7 +18,7 @@
 	if(timeleft == -10)
 		round_status = "Round Delayed -- Thanks for playing!"
 
-	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], [round_status] -- [server]")
+	return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([round_timestamp()]): " : "([round_timestamp()]): "]Players: [length(GLOB.clients)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], [round_status] -- [server]")
 
 /datum/tgs_chat_command/fangfuckies // Friend
 	name = "fangfuckies"

From 4ebde7d410f6a07b1e4ee07ae48672e1ce5e7991 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Sat, 25 Jul 2026 18:03:22 -0400
Subject: [PATCH 13/14] ye

---
 tgstation.dme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tgstation.dme b/tgstation.dme
index b4073896afe6..ae05943183d0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8149,7 +8149,6 @@
 #include "modular_zapoc\modules\decor\code\man_crystal.dm"
 #include "modular_zapoc\modules\decor\code\superhigh_railing.dm"
 #include "modular_zapoc\modules\decor\code\torch.dm"
-#include "modular_zapoc\modules\discord\tgs_commands.dm"
 #include "modular_zapoc\modules\gray_masses\code\effects.dm"
 #include "modular_zapoc\modules\gray_masses\code\gray_core.dm"
 #include "modular_zapoc\modules\gray_masses\code\gray_man.dm"

From af3ade358641fbd8bc9563decd315da6ec0303f2 Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Sun, 26 Jul 2026 16:42:30 -0400
Subject: [PATCH 14/14] oops

---
 tgstation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tgstation.dme b/tgstation.dme
index ae05943183d0..6461292816d9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8132,6 +8132,7 @@
 #include "modular_darkpack\modules\z_travel\code\transfer_point.dm"
 #include "modular_zapoc\master_files\code\controllers\configuration\entries\general.dm"
 #include "modular_zapoc\master_files\code\game\objects\structures\stairs.dm"
+#include "modular_zapoc\master_files\code\modules\discord\tgs_commands.dm"
 #include "modular_zapoc\modules\areas\code\areas.dm"
 #include "modular_zapoc\modules\areas\code\voivodate.dm"
 #include "modular_zapoc\modules\areas\code\western_eye.dm"