mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
[MIRROR] Deviant Crew antag panel category, Obsessed crew now shown in orbit menu, Paradox Clone orbit tab is now white [MDB IGNORE] (#25803)
* Deviant Crew antag panel category, Obsessed crew now shown in orbit menu, Paradox Clone orbit tab is now white (#80450) ## About The Pull Request This rounds up the "Other" (Brainwashed, Hypnotised, Wizard Revenge, and Obsession) antagonist category into the new "Deviant Crew" category. This tab is white! Obsessed crew are now displayed in the orbit panel (no other antagonists in this group are though). The Spacetime Aberrations (Paradox Clone) group has also been changed to be white. Here's how that looks:  ## Why It's Good For The Game As was the case with paradox clones, observers can already discern when a player is obsessed. It shouldn't be a pain to observe these guys, especially when they're a more RP oriented antag that are (usually) deserving of the audience. I made paradox clones and obsessed the same color because they're both in the broader spectrum of "fucked up crew". Also converts common text entries to a single define. That is good coding practice I think. ## Changelog 🆑 Rhials qol: Obsessed crewmembers are now displayed in the orbit panel. qol: The Paradox Clone orbit menu tab is now white. Neat! /🆑 * Deviant Crew antag panel category, Obsessed crew now shown in orbit menu, Paradox Clone orbit tab is now white --------- Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
This commit is contained in:
@@ -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'.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
Reference in New Issue
Block a user