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

feat(port): Bionics can require another bionic #5484

Merged
merged 11 commits into from
Oct 2, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Oct 1, 2024

Checklist

Required

Optional

Purpose of change

ports

Fixes #5455

Describe the solution

ports the dda change which can allow bionic A to require bionic B to already be installed prior to installation of Bionic A

Describe alternatives you've considered

Testing

temp1
temp2
temp3
image

Additional context

https: //github.com/CleverRaven/Cataclysm-DDA/pull/66996
Co-Authored-By: anoobindisguise <[email protected]>
@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. labels Oct 1, 2024
Copy link
Contributor

autofix-ci bot commented Oct 1, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@github-actions github-actions bot added the docs PRs releated to docs page label Oct 1, 2024
doc/src/content/docs/en/mod/json/reference/json_info.md Outdated Show resolved Hide resolved
@scarf005 scarf005 self-requested a review October 2, 2024 00:08
@scarf005 scarf005 dismissed their stale review October 2, 2024 00:18

formatting changes applied

@scarf005 scarf005 requested review from chaosvolt and removed request for scarf005 October 2, 2024 00:23
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

I might first advise checking for professions that use hydraulic muscles and add the needed CBM to them, just to be safe.

@chaosvolt chaosvolt dismissed their stale review October 2, 2024 05:18

Did it myself instead

@scarf005
Copy link
Member

scarf005 commented Oct 2, 2024

I might first advise checking for professions that use hydraulic muscles and add the needed CBM to them, just to be safe.

or even better, maybe auto-add required bionics in following PR?

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Aight, looks good now, compiles and starting as a cyborg with the relevant CBMs doesn't do anything weird.

@chaosvolt chaosvolt merged commit 5625f29 into cataclysmbnteam:main Oct 2, 2024
12 checks passed
@Zlorthishen Zlorthishen deleted the required-bionics branch October 3, 2024 00:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create our own implementation of bionics requiring other bionics
3 participants