Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

[EXPERIMENTAL] Traitors are assigned after 3 to 5 minutes - #11746

Merged
JamieD1 merged 9 commits into
yogstation13:masterfrom
Bibby0110:patch-24
Aug 14, 2021
Merged

[EXPERIMENTAL] Traitors are assigned after 3 to 5 minutes#11746
JamieD1 merged 9 commits into
yogstation13:masterfrom
Bibby0110:patch-24

Conversation

@Bibby0110

@Bibby0110 Bibby0110 commented Jul 10, 2021

Copy link
Copy Markdown
Contributor

Github documenting your Pull Request

You're no longer safe from becoming a target if you latejoin.
Hopefully this helps increase the amount of people that ready up?

Untested and need to do other changes

  • Verify how objectives are picked
  • Testing everything

Changelog

🆑
experimental: Traitors are only made aware of their traitor ways after approximately 2 minutes.
/:cl:

@adamsong

Copy link
Copy Markdown
Contributor

This would prevent people who roll jobs that can't be traitor from rolling traitor

@adamsong

adamsong commented Jul 10, 2021

Copy link
Copy Markdown
Contributor

Also, would this negate quiet mode?
EDIT: I see you added a check for it

@Bibby0110

Copy link
Copy Markdown
Contributor Author

This would prevent people who roll jobs that can't be traitor from rolling traitor

This works in the exact same way that we do traitors now, the timer is just 2 minutes instead of 1-10 seconds.
My code addition is to re-roll a traitor if they’ve disconnected/died before they’re told they’re a traitor

@adamsong adamsong left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks mostly good, just some small changes. Get this compiling and it can be test merged. I will definitely be interested to see how well it works.

As for the objectives, they are rolled when the datum is given, so in this case after the two minutes.

Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
@adamsong

Copy link
Copy Markdown
Contributor

Does this apply to all traitor gamemodes, such as traitorlings, or just solo traitors?

@Bibby0110

Copy link
Copy Markdown
Contributor Author

Does this apply to all traitor gamemodes, such as traitorlings, or just solo traitors?

just sole traitor for now

adamsong
adamsong previously approved these changes Jul 10, 2021
@adamsong
adamsong dismissed their stale review July 10, 2021 20:21

Don't want to approve this yet, but the requested changes were made

@adamsong adamsong added Test Merge - Scheduled This PR is waiting to be test merged Test Merge - Requested This PR is waiting for a test merge to be scheduled and removed Test Merge - Scheduled This PR is waiting to be test merged labels Jul 11, 2021

@adamsong adamsong left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Add a greater variance to the start delay

Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
@adamsong adamsong added the Test Merge - Scheduled This PR is waiting to be test merged label Jul 11, 2021
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm Outdated
Comment thread code/game/gamemodes/traitor/traitor.dm
@Bibby0110 Bibby0110 changed the title [EXPERIMENTAL] Traitors are assigned after 2 minutes [EXPERIMENTAL] Traitors are assigned after 3 to 5 minutes Jul 11, 2021
@monster860

Copy link
Copy Markdown
Member

Time to just wait 5 minutes after latejoining instead

@Bibby0110

Copy link
Copy Markdown
Contributor Author

Time to just wait 5 minutes after latejoining instead

most people probably won't do this so we're good

@adamsong

Copy link
Copy Markdown
Contributor

Seems to be working in test merge, need to do a bit more testing, and then add this to the combined modes

@MegaEmpirical

Copy link
Copy Markdown

Nifty

@Cartlord

Copy link
Copy Markdown
Contributor

BRO THIS ROLLED A FREE MINER AS SYNDIE ROUND 36291

@adamsong

Copy link
Copy Markdown
Contributor

Seems to also work on traitorling rounds, possibly other combo rounds

@Cartlord

Copy link
Copy Markdown
Contributor

So uh, there doesn't seem to be anything in place that keeps Lifegivers, Free Miners, or Charlie Station folks from being antags. That seems like a bad thing - what's a Lifegiver meant to do if they get Hijack or something?

@adamsong

Copy link
Copy Markdown
Contributor

Add a check to make sure they are on the station z-level, so if a ghost role is on the station, such as free miners, they can get it, and it means they can get on the station for their objectives, otherwise they can't become traitor

@adamsong adamsong added the TESTMERGED This PR is currently live in a test merge. label Aug 10, 2021
Comment thread code/game/gamemodes/traitor/traitor.dm
@Bibby0110
Bibby0110 requested a review from JamieD1 August 14, 2021 13:03
@JamieD1
JamieD1 merged commit e6a3f53 into yogstation13:master Aug 14, 2021
Yogbot-13 added a commit that referenced this pull request Aug 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Test Merge - Requested This PR is waiting for a test merge to be scheduled Test Merge - Scheduled This PR is waiting to be test merged TESTMERGED This PR is currently live in a test merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants