From 868731293511ac7271a2c88fa4cda82fea69403d Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 31 May 2021 18:14:06 +0300 Subject: [PATCH] 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) => { {antagonists.length > 0 && ( -
+
{sortedAntagonists.map(([name, antags]) => (
{antags