diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 6ed9272a9ff..8c329abe5ea 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -333,6 +333,7 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list( #define ANTAG_GROUP_FUGITIVES "Escaped Fugitives" #define ANTAG_GROUP_HUNTERS "Bounty Hunters" #define ANTAG_GROUP_PARADOX "Spacetime Aberrations" +#define ANTAG_GROUP_CREW "Deviant Crew" // This flag disables certain checks that presume antagonist datums mean 'baddie'. diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index e58f54f2c65..7a84fc183c4 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -33,7 +33,7 @@ roundend_category = "brainwashed victims" show_in_antagpanel = TRUE antag_hud_name = "brainwashed" - antagpanel_category = "Other" + antagpanel_category = ANTAG_GROUP_CREW show_name_in_check_antagonists = TRUE count_against_dynamic_roll_chance = FALSE ui_name = "AntagInfoBrainwashed" diff --git a/code/modules/antagonists/hypnotized/hypnotized.dm b/code/modules/antagonists/hypnotized/hypnotized.dm index 2ee17b671aa..4f1f49aa3be 100644 --- a/code/modules/antagonists/hypnotized/hypnotized.dm +++ b/code/modules/antagonists/hypnotized/hypnotized.dm @@ -6,7 +6,7 @@ antag_hud_name = "brainwashed" ui_name = "AntagInfoBrainwashed" show_in_antagpanel = TRUE - antagpanel_category = "Other" + antagpanel_category = ANTAG_GROUP_CREW show_name_in_check_antagonists = TRUE count_against_dynamic_roll_chance = FALSE diff --git a/code/modules/antagonists/obsessed/obsessed.dm b/code/modules/antagonists/obsessed/obsessed.dm index 92b3140d47b..a866ef4c2fc 100644 --- a/code/modules/antagonists/obsessed/obsessed.dm +++ b/code/modules/antagonists/obsessed/obsessed.dm @@ -1,8 +1,9 @@ /datum/antagonist/obsessed name = "Obsessed" show_in_antagpanel = TRUE - antagpanel_category = "Other" + antagpanel_category = ANTAG_GROUP_CREW job_rank = ROLE_OBSESSED + show_to_ghosts = TRUE antag_hud_name = "obsessed" show_name_in_check_antagonists = TRUE roundend_category = "obsessed" diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm b/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm index b92ae4d2f20..7dc514f2e18 100644 --- a/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm +++ b/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm @@ -71,7 +71,7 @@ name = "\improper Wizard Prank Victim" roundend_category = "wizard prank victims" show_in_antagpanel = FALSE - antagpanel_category = "Other" + antagpanel_category = ANTAG_GROUP_CREW show_name_in_check_antagonists = TRUE count_against_dynamic_roll_chance = FALSE silent = TRUE diff --git a/tgui/packages/tgui/interfaces/Orbit/constants.ts b/tgui/packages/tgui/interfaces/Orbit/constants.ts index c3b87bb47e0..35fe4df9de8 100644 --- a/tgui/packages/tgui/interfaces/Orbit/constants.ts +++ b/tgui/packages/tgui/interfaces/Orbit/constants.ts @@ -8,6 +8,8 @@ export const ANTAG2COLOR = { 'Emergency Response Team': 'teal', 'Escaped Fugitives': 'orange', 'Xenomorph Infestation': 'violet', + 'Spacetime Aberrations': 'white', + 'Deviant Crew': 'white', } as const; export const THREAT = {