From 8baa0568b09cb9516192696ad8b06558c1d3eece Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Wed, 23 Dec 2020 15:12:38 -0900
Subject: [PATCH 1/2] Adds (Follow) link to emotes for ghosts

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

diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index bff705d0c51..a8b94d602a4 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -37,6 +37,7 @@
 			var/mob/M = mob
 			spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
 				if(M)
+<<<<<<< HEAD
 					//VOREStation edit
 					if(istype(M, /mob/observer/dead/))
 						var/mob/observer/dead/D = M
@@ -45,6 +46,11 @@
 					else
 						M.show_message(message, m_type)
 					//End VOREStation edit
+=======
+					if(isobserver(M))
+						message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
+					M.show_message(message, m_type)
+>>>>>>> 47c1641... Merge pull request #7796 from Atermonera/ghost_emote
 
 		for(var/obj in o_viewers)
 			var/obj/O = obj

From 85485c41c4a96ebaef81a5a6dee9f2a7c0e632fe Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 28 Feb 2021 17:40:21 -0500
Subject: [PATCH 2/2] Update emote.dm

---
 code/modules/mob/emote.dm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index a8b94d602a4..2a8af560804 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -37,20 +37,15 @@
 			var/mob/M = mob
 			spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
 				if(M)
-<<<<<<< HEAD
-					//VOREStation edit
-					if(istype(M, /mob/observer/dead/))
+					if(isobserver(M))
+						//VOREStation Edit Start
 						var/mob/observer/dead/D = M
 						if(ckey || (src in view(D)))
 							M.show_message(message, m_type)
+							message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
 					else
 						M.show_message(message, m_type)
-					//End VOREStation edit
-=======
-					if(isobserver(M))
-						message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
-					M.show_message(message, m_type)
->>>>>>> 47c1641... Merge pull request #7796 from Atermonera/ghost_emote
+						//VOREStation Edit End
 
 		for(var/obj in o_viewers)
 			var/obj/O = obj