Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,13 @@
minimum_players = 25
repeatable = FALSE

/datum/dynamic_ruleset/latejoin/trim_candidates()
. = ..()
for(var/mob/living/carbon/C in candidates)
if(C?.dna?.species && (NOBLOOD in C?.dna?.species.species_traits))
candidates -= C
continue

/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
var/mob/latejoiner = pick(candidates) // This should contain a single player, but in case.
assigned += latejoiner.mind
Expand Down
5 changes: 5 additions & 0 deletions code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,11 @@
/datum/dynamic_ruleset/midround/bloodsucker/trim_candidates()
. = ..()
for(var/mob/living/player in living_players)
if(iscarbon(player))
var/mob/living/carbon/C = player
if(C?.dna?.species && (NOBLOOD in C?.dna?.species.species_traits))
living_players -= player
continue
if(issilicon(player)) // Your assigned role doesn't change when you are turned into a silicon.
living_players -= player
else if(is_centcom_level(player.z))
Expand Down
6 changes: 6 additions & 0 deletions code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,12 @@
antag_cap = list("denominator" = 24)
minimum_players = 25

/datum/dynamic_ruleset/roundstart/bloodsucker/trim_candidates()
. = ..()
for(var/mob/player in candidates)
if(player?.client?.prefs.pref_species && (NOBLOOD in player.client.prefs.pref_species.species_traits))
candidates.Remove(player)

/datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute(population)
. = ..()
var/num_bloodsuckers = get_antag_cap(population) * (scaled_times + 1)
Expand Down