From 868731293511ac7271a2c88fa4cda82fea69403d Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Mon, 31 May 2021 18:14:06 +0300
Subject: [PATCH 1/3] Makes orbit menu show antags if DNR

---
 code/modules/mob/dead/observer/orbit.dm | 3 ++-
 tgui/packages/tgui/interfaces/Orbit.js  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 26494dcb34..2b24c767c1 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -83,7 +83,8 @@
 
 				for (var/_A in mind.antag_datums)
 					var/datum/antagonist/A = _A
-					if (A.show_to_ghosts)
+					var/mob/dead/observer/O = user
+					if (A.show_to_ghosts || O && !O.can_reenter_corpse)
 						was_antagonist = TRUE
 						serialized["antag"] = A.name
 						antagonists += list(serialized)
diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js
index d71348c412..f8f1351c06 100644
--- a/tgui/packages/tgui/interfaces/Orbit.js
+++ b/tgui/packages/tgui/interfaces/Orbit.js
@@ -165,7 +165,7 @@ export const Orbit = (props, context) => {
           </Flex>
         </Section>
         {antagonists.length > 0 && (
-          <Section title="Ghost-Visible Antagonists">
+          <Section title="Visible Antagonists">
             {sortedAntagonists.map(([name, antags]) => (
               <Section key={name} title={name} level={2}>
                 {antags

From 4b541d3dac541cdfccf662c884d3c87369b3def9 Mon Sep 17 00:00:00 2001
From: Arturlang <arturpaavooskari.lang@gmail.com>
Date: Tue, 1 Jun 2021 02:21:33 +0300
Subject: [PATCH 2/3] phonecode

---
 code/modules/mob/dead/observer/orbit.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 2b24c767c1..759cc08d35 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -84,7 +84,7 @@
 				for (var/_A in mind.antag_datums)
 					var/datum/antagonist/A = _A
 					var/mob/dead/observer/O = user
-					if (A.show_to_ghosts || O && !O.can_reenter_corpse)
+					if (A && A.show_to_ghosts || O && !O.can_reenter_corpse)
 						was_antagonist = TRUE
 						serialized["antag"] = A.name
 						antagonists += list(serialized)

From 84db564e0fa7adf66e96273bd21d40cafd164ce1 Mon Sep 17 00:00:00 2001
From: Arturlang <arturpaavooskari.lang@gmail.com>
Date: Tue, 1 Jun 2021 02:25:06 +0300
Subject: [PATCH 3/3] Prettier? code

---
 code/modules/mob/dead/observer/orbit.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 759cc08d35..b799c5e592 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -84,7 +84,7 @@
 				for (var/_A in mind.antag_datums)
 					var/datum/antagonist/A = _A
 					var/mob/dead/observer/O = user
-					if (A && A.show_to_ghosts || O && !O.can_reenter_corpse)
+					if (A?.show_to_ghosts || !O?.can_reenter_corpse)
 						was_antagonist = TRUE
 						serialized["antag"] = A.name
 						antagonists += list(serialized)