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

Blood Brothers #27622

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from

Conversation

whateverusername0
Copy link
Contributor

@whateverusername0 whateverusername0 commented May 2, 2024

About the PR

literally the same as in design doc

Why / Balance

ss13 content, more antags real shit

Technical details

I dunno I just shitstormed it by looking at how other antags work.
Also added "factions" to roundend text to separate BBs teams.

Media

TBD
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

None (i think)

TODO

  • actually implement it correctly

Changelog

🆑

  • add: Added Blood Brothers - traitors with a bit of brotherly love. Complete your tasks with nothing but a random crewmember on your side!

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label May 2, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

RSI Diff Bot; head commit 42d8e08 merging into dfe01c7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
BloodBrother Added

Resources/Textures/Objects/Weapons/Melee/flash.rsi

State Old New Status
burnt-bloodbrother Added
flash-bloodbrother Added
flashing-bloodbrother Added
inhand-left-bloodbrother Added
inhand-right-bloodbrother Added

Edit: diff updated after 42d8e08

@metalgearsloth
Copy link
Contributor

This needs updating for antag refactor and a design doc.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label May 2, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@whateverusername0
Copy link
Contributor Author

ok here

whateverusername0 added 2 commits May 3, 2024 03:19
@whateverusername0
Copy link
Contributor Author

what?

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label May 2, 2024
@SpeltIncorrectyl
Copy link
Contributor

what?

git shenanigans

@mirrorcult mirrorcult added the Feature Freeze: Closed from May 10 to June 14 This PR is still active, but will be closed from May 10 to June 14 as part of the feature freeze. label May 6, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label May 10, 2024
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label May 10, 2024
whateverusername0 added 2 commits May 10, 2024 13:37
@Emisse
Copy link
Contributor

Emisse commented May 10, 2024

Closed due to feature freeze May 10th-June 14th. Comment to have it reopen after this.

@Emisse Emisse closed this May 10, 2024
@whateverusername0 whateverusername0 changed the title Blood Brothers or spicing up traitor rounds Blood Brothers May 20, 2024
@whateverusername0
Copy link
Contributor Author

can someone reopen it? it was a draft PR anyways. i can't resolve merge conflicts like that 😨

@whateverusername0
Copy link
Contributor Author

reopen plis... it was a draft...

@UbaserB UbaserB reopened this Jun 14, 2024
@AJCM-git AJCM-git removed the Feature Freeze: Closed from May 10 to June 14 This PR is still active, but will be closed from May 10 to June 14 as part of the feature freeze. label Jun 17, 2024
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 20, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jun 22, 2024
@ps3moira
Copy link
Contributor

any updates?

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Merge Conflict This PR currently has conflicts that need to be addressed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants