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: Adding alcohol-fueled soldering iron, and a lot of recipe optimations/changes #4457

Merged
merged 3 commits into from
Apr 9, 2024

Conversation

Lamandus
Copy link
Contributor

@Lamandus Lamandus commented Apr 9, 2024

Purpose of change

This is a big one, it was a string of changes that went from creating A, to creating B etc.. All in all, this PR was created to make a concentrated alcohol fueled soldering iron. As in, you got a burner, and you hold a metal over it to heat it up and use for soldering, instead of using electricity.

Describe the solution

Not to the list of changes, because one lead to another. (Sorry Co-Devs)

  1. Creating a new item: alcohol fueled soldering iron.
    a. Adding recipe
    b. Adding spawn locations
    c. Adding it to tool-lists for crafting.
  2. Sane-checking the use of the soldering iron
  3. remove the welder in some clothes recipes, because it wouldn't need glare protection.
  4. remove the welder in some recipe for weapon mods where the repair-kits would be enough (also removing the requirement of glare protection.
  5. removal of the repair kits in some recipe, where it would make sense to use the welder instead (with glare protection)
  6. make the alcohol-stove auto learn, use more containers for the ethanol than just a plastic bottle.
  7. usage of "toolsets"

Describe alternatives you've considered

using lamp oil instead, but that would be too easy to acquire.

Testing

it works.

Additional context

pain. Please @chaosvolt be kind to me!

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Apr 9, 2024
Copy link
Contributor

autofix-ci bot commented Apr 9, 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 tests changes related to tests label Apr 9, 2024
@Lamandus Lamandus merged commit bde6cbb into cataclysmbnteam:main Apr 9, 2024
12 checks passed
@Lamandus Lamandus deleted the sold branch April 9, 2024 20:31
@Unrepentant-Atheist
Copy link

image

Missing in a few recipes...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. tests changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants