diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 6360164da8e6b..df870451d23eb 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -364,6 +364,7 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list( /// The storyteller will count everyone on this antag's team as a singular antag instead. #define FLAG_ANTAG_CAP_TEAM (1 << 3) /// The storyteller will only count a single instance of this type of antag datum. +// NOTE: Currently both FLAG_ANTAG_CAP_TEAM and FLAG_ANTAG_CAP_SINGLE are unused in modern storyteller. May be good to include them but functionally will not work. /// Basically FLAG_ANTAG_CAP_TEAM if you're too lazy to refactor the antag to actually use a team. #define FLAG_ANTAG_CAP_SINGLE (1 << 4) /// If set then we ignore mobs being human or not for antag point counting diff --git a/code/modules/antagonists/space_dragon/space_carp.dm b/code/modules/antagonists/space_dragon/space_carp.dm index 9b482c3e59e55..f944b82a031f4 100644 --- a/code/modules/antagonists/space_dragon/space_carp.dm +++ b/code/modules/antagonists/space_dragon/space_carp.dm @@ -6,6 +6,7 @@ show_name_in_check_antagonists = TRUE show_to_ghosts = TRUE antag_count_points = 0.5 + antag_flags = FLAG_ANTAG_CAP_IGNORE_HUMANITY /// The rift to protect var/datum/weakref/rift diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 6e19b5737012b..32c49d5fca970 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -8,6 +8,7 @@ show_to_ghosts = TRUE stinger_sound = 'sound/magic/demon_attack1.ogg' antag_count_points = 15 + antag_flags = FLAG_ANTAG_CAP_IGNORE_HUMANITY /// All space carps created by this antagonist space dragon var/list/datum/mind/carp = list() /// The innate ability to summon rifts diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm index 9578750f3bdf0..34d8285cda419 100644 --- a/code/modules/antagonists/xeno/xeno.dm +++ b/code/modules/antagonists/xeno/xeno.dm @@ -22,7 +22,7 @@ antagpanel_category = ANTAG_GROUP_XENOS prevent_roundtype_conversion = FALSE show_to_ghosts = TRUE - antag_flags = FLAG_ANTAG_CAP_TEAM + antag_flags = FLAG_ANTAG_CAP_TEAM | FLAG_ANTAG_CAP_IGNORE_HUMANITY antag_count_points = 4 var/datum/team/xeno/xeno_team diff --git a/monkestation/code/modules/antagonists/bloodling/infested_thrall.dm b/monkestation/code/modules/antagonists/bloodling/infested_thrall.dm index 96beccfd2bfdd..d59bd7e82f5d2 100644 --- a/monkestation/code/modules/antagonists/bloodling/infested_thrall.dm +++ b/monkestation/code/modules/antagonists/bloodling/infested_thrall.dm @@ -63,7 +63,8 @@ antag_hud_name = "infested_thrall" hijack_speed = 0 suicide_cry = "FOR THE MASTER!!" - antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_TEAM + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_TEAM | FLAG_ANTAG_CAP_IGNORE_HUMANITY + antag_count_points = 5 // This thralls master var/master = null diff --git a/monkestation/code/modules/antagonists/borers/code/antagonist_stuff/antagonist_datum.dm b/monkestation/code/modules/antagonists/borers/code/antagonist_stuff/antagonist_datum.dm index c0210faa7d586..0178201a0da71 100644 --- a/monkestation/code/modules/antagonists/borers/code/antagonist_stuff/antagonist_datum.dm +++ b/monkestation/code/modules/antagonists/borers/code/antagonist_stuff/antagonist_datum.dm @@ -4,10 +4,10 @@ roundend_category = "enslaved cortical borers" // may look a bit confusing, but these borers are not a part of a hivemind. So they are probably enslaved antagpanel_category = "Cortical Borers" ui_name = "AntagInfoBorer" - count_against_dynamic_roll_chance = FALSE // there are thousands of them, we do not need them to be the only antagonist prevent_roundtype_conversion = FALSE show_to_ghosts = TRUE - + antag_flags = parent_type::antag_flags | FLAG_ANTAG_CAP_IGNORE_HUMANITY + antag_count_points = 0.5 //While a single borer can be helpful, if you have a lot on station things are bound to get chaotic and a few diveworms. /// Our linked borer, used for the antagonist panel TGUI var/mob/living/basic/cortical_borer/cortical_owner diff --git a/monkestation/code/modules/veth_misc_items/bingle/bingle_datum.dm b/monkestation/code/modules/veth_misc_items/bingle/bingle_datum.dm index 480cdfa31e412..702dfce85566b 100644 --- a/monkestation/code/modules/veth_misc_items/bingle/bingle_datum.dm +++ b/monkestation/code/modules/veth_misc_items/bingle/bingle_datum.dm @@ -12,7 +12,7 @@ if too much trash on ground bingles roll show_name_in_check_antagonists = TRUE hud_icon = 'monkestation/code/modules/veth_misc_items/bingle/icons/bingle_hud.dmi' show_to_ghosts = TRUE - antag_flags = FLAG_ANTAG_CAP_TEAM + antag_flags = FLAG_ANTAG_CAP_IGNORE_HUMANITY | FLAG_ANTAG_CAP_TEAM antag_count_points = 3 var/static/datum/team/bingles/dont_bungle_the_bingle var/obj/structure/bingle_hole/pit_check