diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index f00a9ede71d3..020efe8d0858 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -342,11 +342,13 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list( #define HUNTER_PACK_PSYKER "Psyker Shikaris" // This flag disables certain checks that presume antagonist datums mean 'baddie'. -#define FLAG_FAKE_ANTAG (1 << 0) +#define FLAG_FAKE_ANTAG (1 << 0) +/// monkestation addition: Whether the antagonist can see exploitable info on people they examine. +#define FLAG_CAN_SEE_EXPOITABLE_INFO (1 << 1) // monkestation addition: The storyteller will ignore this antag datum as counting against the antag cap. -#define FLAG_ANTAG_CAP_IGNORE (1 << 1) +#define FLAG_ANTAG_CAP_IGNORE (1 << 2) // monkestation addition: The storyteller will count everyone on this antag's team as a singular antag instead. -#define FLAG_ANTAG_CAP_TEAM (1 << 2) +#define FLAG_ANTAG_CAP_TEAM (1 << 3) #define FREEDOM_IMPLANT_CHARGES 4 diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 19a346e3654c..9ea41eca4aba 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(antagonists) /// The typepath for the outfit to show in the preview for the preferences menu. var/preview_outfit /// Flags for antags to turn on or off and check! - var/antag_flags = NONE + var/antag_flags = FLAG_CAN_SEE_EXPOITABLE_INFO // monkestation edit: allow antags to see exploitable info. /// If true, this antagonist can assign themself a new objective var/can_assign_self_objectives = FALSE /// Default to fill in when entering a custom objective. diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 6e7aa6627d28..ed32ca368d5a 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -7,7 +7,7 @@ show_in_antagpanel = FALSE //should only show subtypes show_to_ghosts = TRUE suicide_cry = "FOR THE MOTHERSHIP!!" // They can't even talk but y'know - antag_flags = FLAG_ANTAG_CAP_TEAM // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_TEAM // monkestation addition var/datum/team/abductor_team/team var/sub_role var/outfit diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 66184e73b4ab..22991570da91 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -8,7 +8,7 @@ ui_name = "AntagInfoBrother" suicide_cry = "FOR MY BROTHER!!" antag_moodlet = /datum/mood_event/focused - antag_flags = FLAG_ANTAG_CAP_TEAM // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_TEAM // monkestation addition VAR_PRIVATE datum/team/brother_team/team diff --git a/code/modules/antagonists/changeling/fallen_changeling.dm b/code/modules/antagonists/changeling/fallen_changeling.dm index 8b5de612ab93..ba5d3c3976ba 100644 --- a/code/modules/antagonists/changeling/fallen_changeling.dm +++ b/code/modules/antagonists/changeling/fallen_changeling.dm @@ -6,7 +6,7 @@ job_rank = ROLE_CHANGELING antag_moodlet = /datum/mood_event/fallen_changeling antag_hud_name = "changeling" - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /datum/mood_event/fallen_changeling description = "My powers! Where are my powers?!" diff --git a/code/modules/antagonists/heretic/heretic_monsters.dm b/code/modules/antagonists/heretic/heretic_monsters.dm index 780d8331a853..db220e93bd5d 100644 --- a/code/modules/antagonists/heretic/heretic_monsters.dm +++ b/code/modules/antagonists/heretic/heretic_monsters.dm @@ -8,7 +8,7 @@ antag_hud_name = "heretic_beast" suicide_cry = "MY MASTER SMILES UPON ME!!" show_in_antagpanel = FALSE - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /// Our master (a heretic)'s mind. var/datum/mind/master diff --git a/code/modules/antagonists/magic_servant/servant.dm b/code/modules/antagonists/magic_servant/servant.dm index c8a63f82b8ed..8851776213fe 100644 --- a/code/modules/antagonists/magic_servant/servant.dm +++ b/code/modules/antagonists/magic_servant/servant.dm @@ -3,7 +3,7 @@ show_in_roundend = FALSE show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /datum/antagonist/magic_servant/proc/setup_master(mob/M) var/datum/objective/O = new("Serve [M.real_name].") diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index d6044eff2d17..8812de960ddd 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -7,7 +7,7 @@ show_to_ghosts = TRUE suicide_cry = "FOR ME MATEYS!!" hijack_speed = 2 // That is without doubt the worst pirate I have ever seen. - antag_flags = FLAG_ANTAG_CAP_TEAM // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_TEAM // monkestation addition var/datum/team/pirate/crew /datum/antagonist/pirate/greet() diff --git a/code/modules/antagonists/revolution/enemy_of_the_revolution.dm b/code/modules/antagonists/revolution/enemy_of_the_revolution.dm index 17506c72c255..0e20463d4898 100644 --- a/code/modules/antagonists/revolution/enemy_of_the_revolution.dm +++ b/code/modules/antagonists/revolution/enemy_of_the_revolution.dm @@ -7,7 +7,7 @@ name = "\improper Enemy of the Revolution" show_in_antagpanel = FALSE suicide_cry = "FOR NANOTRASEN, NOW AND FOREVER!!" - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /datum/antagonist/enemy_of_the_revolution/forge_objectives() var/datum/objective/survive/survive = new diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index b9171f92dc3c..d27ad3df8a10 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -4,7 +4,7 @@ show_name_in_check_antagonists = TRUE hijack_speed = 2 //You literally are here to do nothing else. Might as well be fast about it. suicide_cry = "HAHAHAHAHA!!" - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /datum/antagonist/wishgranter/forge_objectives() var/datum/objective/hijack/hijack = new diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 75207149c1e4..f3f6c810baa9 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key) antag_hud_name = "apprentice" show_in_roundend = FALSE show_name_in_check_antagonists = TRUE - antag_flags = FLAG_ANTAG_CAP_IGNORE // monkestation addition + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE // monkestation addition /// The wizard team this wizard minion is part of. var/datum/team/wizard/wiz_team diff --git a/monkestation/code/__DEFINES/antag_defines.dm b/monkestation/code/__DEFINES/antag_defines.dm deleted file mode 100644 index 33358561c55a..000000000000 --- a/monkestation/code/__DEFINES/antag_defines.dm +++ /dev/null @@ -1,2 +0,0 @@ -/// Whether the antagonist can see exploitable info on people they examine. -#define FLAG_CAN_SEE_EXPOITABLE_INFO (1<<1) diff --git a/monkestation/code/modules/antagonists/_common/antag_datum.dm b/monkestation/code/modules/antagonists/_common/antag_datum.dm index 5995594cf332..177b48b11b54 100644 --- a/monkestation/code/modules/antagonists/_common/antag_datum.dm +++ b/monkestation/code/modules/antagonists/_common/antag_datum.dm @@ -1,6 +1,4 @@ /datum/antagonist - /// Allows antags to check exploitable info - antag_flags = FLAG_CAN_SEE_EXPOITABLE_INFO ///The list of keys that are valid to see our antag hud/of huds we can see var/list/hud_keys /// If this antagonist should be removed from the crew manifest upon gain. diff --git a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm index 2e0db82fe24c..22beb4158965 100644 --- a/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm +++ b/monkestation/code/modules/antagonists/clock_cult/antag_datums/clock_cultist.dm @@ -203,7 +203,7 @@ /datum/antagonist/clock_cultist/eminence name = "Eminence" - antag_flags = FLAG_ANTAG_CAP_IGNORE + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE give_slab = FALSE antag_moodlet = null communicate = null diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm b/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm index baf70b17771a..f9616c0fa198 100644 --- a/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm +++ b/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm @@ -5,7 +5,7 @@ antagpanel_category = "Evil Clones" show_name_in_check_antagonists = TRUE show_to_ghosts = TRUE - antag_flags = FLAG_ANTAG_CAP_IGNORE + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE /datum/antagonist/evil_clone/greet() . = ..() diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm index eb2b416c2e1c..8384c6b6c1be 100644 --- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm +++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_shaded.dm @@ -5,7 +5,7 @@ show_in_roundend = FALSE job_rank = ROLE_BLOODSUCKER antag_hud_name = "bloodsucker" - antag_flags = FLAG_ANTAG_CAP_IGNORE + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE /obj/item/soulstone/bloodsucker theme = THEME_WIZARD diff --git a/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm b/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm index 72544e108f16..72acb40a6d79 100644 --- a/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm +++ b/monkestation/code/modules/bloodsuckers/vassals/vassal_datum.dm @@ -8,7 +8,7 @@ roundend_category = "vassals" antagpanel_category = "Bloodsucker" job_rank = ROLE_BLOODSUCKER - antag_flags = FLAG_ANTAG_CAP_IGNORE + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE antag_hud_name = "vassal" show_in_roundend = FALSE hud_icon = 'monkestation/icons/bloodsuckers/bloodsucker_icons.dmi' diff --git a/tgstation.dme b/tgstation.dme index 45c14db10d3e..1c0e5c594676 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5790,7 +5790,6 @@ #include "interface\fonts\tiny_unicode.dm" #include "interface\fonts\vcr_osd_mono.dm" #include "monkestation\code\__DEFINES\_module_defines.dm" -#include "monkestation\code\__DEFINES\antag_defines.dm" #include "monkestation\code\__DEFINES\projectile.dm" #include "monkestation\code\__DEFINES\signals.dm" #include "monkestation\code\__HELPERS\_lists.dm"