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.

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

Jump to bottom

Derelict Borg Revival #33433

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Derelict Borg Revival #33433

merged 4 commits into from
Dec 6, 2024

Conversation

ScarKy0
Copy link
Contributor

@ScarKy0 ScarKy0 commented Nov 20, 2024 •
edited
Loading

About the PR

Revival of #32499 due to some github mess. It apparently got merged but not really since it was instantly reverted. This PR is basically the same as that one but also cleaned up.

Why / Balance

Read in the original PR.

Technical details

Read in the original PR.

Media

Requirements

Breaking changes

Changelog

🆑 ScarKy0, GoldenCan

  • add: The Derelict Cyborg - a broken cyborg with altered laws due to years of exposure to ion storms - can now appear as a ghost role through a new midround event.

@github-actions github-actions bot added Changes: Sprites Changes: Might require knowledge of spriting or visual design. size/L Denotes a PR that changes 1000-4999 lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 20, 2024 •
edited
Loading

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

Resources/Textures/Mobs/Silicon/chassis.rsi

State Old New Status
derelict Added
derelict_e Added
derelict_e_r Added
derelict_icon Added
derelict_l Added

Edit: diff updated after afb549a

@ScarKy0 ScarKy0 added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D2: Medium Difficulty: A good amount of codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: Roundflow/Antag Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities A: Silicons Area: Relates to Silicon roles, including AI. and removed Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines. labels Nov 20, 2024
@ScarKy0 ScarKy0 changed the title Derelictn'tn't Borg! Derelict Borg Revival Nov 20, 2024
@ScarKy0 ScarKy0 marked this pull request as ready for review November 20, 2024 16:21
@ScarKy0 ScarKy0 requested a review from DrSmugleaf as a code owner November 20, 2024 16:22
@github-actions github-actions bot added size/L Denotes a PR that changes 1000-4999 lines. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Nov 20, 2024
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Nov 26, 2024
@github-actions GitHub Actions
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 S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Nov 28, 2024
slarticodefast
slarticodefast approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

The amount of laws this generates is still a little high.
But I asked the admins for feedback again and they said the players can probably handle it and to ship it and see where it goes, so let's give it a try.

@slarticodefast slarticodefast added S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Dec 3, 2024
@slarticodefast slarticodefast self-assigned this Dec 3, 2024
@chromiumboy
Copy link
Contributor

The code looks fine and I tested it in-game. The randomization of the laws is a bit extreme. I had one borg with a single ion law and no core laws, and another with 2 ion storm laws and 10 core laws (i.e., the 10 commandments). But I saw the admin approval, so let's try it and see what happens

@chromiumboy chromiumboy merged commit 274c3ab into space-wizards:master Dec 6, 2024
14 checks passed
@ScarKy0 ScarKy0 deleted the derelict-revival branch December 20, 2024 04:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slarticodefast slarticodefast slarticodefast approved these changes

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

Assignees

@slarticodefast slarticodefast

Labels
A: Roundflow/Antag Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities A: Silicons Area: Relates to Silicon roles, including AI. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D2: Medium Difficulty: A good amount of codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. size/L Denotes a PR that changes 1000-4999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ScarKy0 @chromiumboy @slarticodefast