diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm
index e43dfc1c31..858996e76b 100644
--- a/code/modules/tgs/v5/chat_commands.dm
+++ b/code/modules/tgs/v5/chat_commands.dm
@@ -8,6 +8,9 @@
 	var/afks = 0
 	var/active = 0
 	var/bellied = 0
+	var/map_name = "n/a"
+	if(using_map && using_map.full_name)
+		map_name = using_map.full_name
 
 	for(var/X in GLOB.clients)
 		var/client/C = X
@@ -21,7 +24,11 @@
 		else
 			active++
 
+<<<<<<< HEAD
 	return "Current server status:\n**Web Manifest:** <http://manifest.chompstation13.net/>\n**Players:** [counts]\n**Active:** [active]\n**Bar Statues:** [afks]\n**Bellied:** [bellied]\n\n**Round Duration:** [roundduration2text()]" //CHOMPEdit
+=======
+	return "Current server status:\n**Web Manifest:** <https://vore-station.net/manifest.php>\n**Players:** [counts]\n**Active:** [active]\n**AFK:** [afks]\n**Bellied:** [bellied]\n\n**Round Duration:** [roundduration2text()]\n**Current Map:** [map_name]"
+>>>>>>> 4f6d124183... Merge pull request #13972 from Heroman3003/mapstatus
 
 /datum/tgs_chat_command/parsetest
 	name = "parsetest"