Skip to content
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.

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

Midround polling for antag and obsessed #162

Merged
merged 1 commit into from
Oct 15, 2024
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
14 changes: 12 additions & 2 deletions code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,15 @@
candidates -= player // We don't autotator people in CentCom
else if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
candidates -= player // We don't autotator people with roles already
// DOPPLER ADDITION START
else if(player in rejected_traitor)
candidates -= player
else if(player in current_polling)
candidates -= player
// DOPPLER ADDITION END

/datum/dynamic_ruleset/midround/from_living/autotraitor/execute()
var/mob/M = pick(candidates)
var/mob/M = pick(poll_candidates_for_one(candidates)) // DOPPLER EDIT, old code: var/mob/M = pick(candidates)
assigned += M
candidates -= M
var/datum/antagonist/traitor/infiltrator/sleeper_agent/newTraitor = new
Expand Down Expand Up @@ -848,11 +854,15 @@
|| candidate.stat == DEAD \
|| !(ROLE_OBSESSED in candidate.client?.prefs?.be_special) \
|| !candidate.mind.assigned_role \
// DOPPLER ADDITION START
|| (candidate in rejected_traitor) \
|| (candidate in current_polling) \
// DOPPLER ADDITION END
)
candidates -= candidate

/datum/dynamic_ruleset/midround/from_living/obsessed/execute()
var/mob/living/carbon/human/obsessed = pick_n_take(candidates)
var/mob/living/carbon/human/obsessed = pick_n_take(poll_candidates_for_one(candidates)) // DOPPLER EDIT, old code: var/mob/living/carbon/human/obsessed = pick_n_take(candidates)
obsessed.gain_trauma(/datum/brain_trauma/special/obsessed)
message_admins("[ADMIN_LOOKUPFLW(obsessed)] has been made Obsessed by the midround ruleset.")
log_game("[key_name(obsessed)] was made Obsessed by the midround ruleset.")
Expand Down
40 changes: 40 additions & 0 deletions modular_doppler/modular_antagonists/_dynamic_rulesets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/datum/dynamic_ruleset/midround/from_living
var/static/list/current_polling = list()
var/static/list/rejected_traitor = list()
/**
* Polls a group of candidates to see if they want to be a sleeper agent.
*
* @param candidates a list containing a candidate mobs
*/
/datum/dynamic_ruleset/midround/from_living/proc/poll_candidates_for_one(candidates)
message_admins("Attempting to poll [length(candidates)] people individually to become [name].")
var/list/yes_candidates = list()
for(var/mob/living/candidate in candidates)
current_polling += candidate
yes_candidates += SSpolling.poll_candidates(
question = "Do you want to play as [name]? If you ignore this, you will be considered to have declined and will be inelegible for traitor/obsessed rolls this round.",
group = list(candidate),
poll_time = 15 SECONDS,
flash_window = TRUE,
start_signed_up = FALSE,
announce_chosen = FALSE,
role_name_text = "[name]",
alert_pic = /obj/structure/sign/poster/contraband/gorlex_recruitment,
custom_response_messages = list(
POLL_RESPONSE_SIGNUP = "You have signed up to be an antagonist!",
POLL_RESPONSE_ALREADY_SIGNED = "You are already signed up to be an antagonist.",
POLL_RESPONSE_NOT_SIGNED = "You aren't signed up to be an antagonist.",
POLL_RESPONSE_TOO_LATE_TO_UNREGISTER = "It's too late to decide against being antagonist.",
POLL_RESPONSE_UNREGISTERED = "You decide against being an antagonist.",
),
chat_text_border_icon = /obj/structure/sign/poster/contraband/gorlex_recruitment,
)
if(length(yes_candidates))
current_polling -= candidate
break
else
message_admins("Candidate [candidate] has declined to be [name].")
rejected_traitor += candidate
current_polling -= candidate

return yes_candidates
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6657,6 +6657,7 @@
#include "modular_doppler\loadout_categories\categories\shoes.dm"
#include "modular_doppler\loadout_categories\categories\toys.dm"
#include "modular_doppler\loadout_categories\categories\undersuit.dm"
#include "modular_doppler\modular_antagonists\_dynamic_rulesets.dm"
#include "modular_doppler\modular_antagonists\changeling\changeling.dm"
#include "modular_doppler\modular_antagonists\datums\antag_recipes.dm"
#include "modular_doppler\modular_antagonists\sapper_gang\sapper.dm"
Expand Down
Loading