From 1bb487ebae55fac58b635f6b081a01020f60e333 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 12 Dec 2017 16:55:55 -0500
Subject: [PATCH 1/2] Fixes lobby stat entries not showing

---
 code/modules/mob/dead/dead.dm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 26b671dd96..fcb6434d85 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -24,6 +24,26 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 /mob/dead/ConveyorMove()	//lol
 	return
 
+<<<<<<< HEAD
+=======
+/mob/dead/Stat()
+	..()
+
+	if(!statpanel("Status"))
+		return
+	stat(null, "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]")
+
+	if(SSticker.HasRoundStarted())
+		return
+
+	var/time_remaining = SSticker.GetTimeLeft()
+	if(time_remaining > 0)
+		stat(null, "Time To Start: [round(time_remaining/10)]s")
+	else if(time_remaining == -10)
+		stat(null, "Time To Start: DELAYED")
+	else
+		stat(null, "Time To Start: SOON")
+>>>>>>> a01cf60... Fixes lobby stat entries not showing (#33496)
 
 
 /mob/dead/proc/server_hop()

From dc7dd2da3ced136346666f93fe8ee103941e1e6e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 12:05:09 -0500
Subject: [PATCH 2/2] Update dead.dm

---
 code/modules/mob/dead/dead.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index fcb6434d85..689ef552d9 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -24,8 +24,6 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 /mob/dead/ConveyorMove()	//lol
 	return
 
-<<<<<<< HEAD
-=======
 /mob/dead/Stat()
 	..()
 
@@ -43,8 +41,6 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 		stat(null, "Time To Start: DELAYED")
 	else
 		stat(null, "Time To Start: SOON")
->>>>>>> a01cf60... Fixes lobby stat entries not showing (#33496)
-
 
 /mob/dead/proc/server_hop()
 	set category = "OOC"