Skip to content

First pass Storyteller dodgeball (Making sure everyone worth intended esk amounts #11063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notghosti wants to merge 4 commits into
base: master
Choose a base branch
from
Open

First pass Storyteller dodgeball (Making sure everyone worth intended esk amounts #11063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd42e2b
First pass
notghosti Mar 11, 2026
df1817f
Battlecruiser + warning
notghosti Mar 11, 2026
c999468
ah thats why
notghosti Mar 11, 2026
8f166ed
that already worked
notghosti Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/antagonists.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/antagonists/space_dragon/space_carp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions code/modules/antagonists/space_dragon/space_dragon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/xeno/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion monkestation/code/modules/antagonists/bloodling/infested_thrall.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/antagonists/borers/code/antagonist_stuff/antagonist_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/veth_misc_items/bingle/bingle_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

@wraith-54321 wraith-54321 Mar 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
antag_count_points = 3
antag_count_points = 1.5

should probably not be worth as much as a human bloodcultist

var/static/datum/team/bingles/dont_bungle_the_bingle
var/obj/structure/bingle_hole/pit_check
Expand Down
Loading