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

Machete proliferation #76176

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Machete proliferation #76176

merged 2 commits into from
Sep 6, 2024

Conversation

DukePaulAtreid3s
Copy link
Contributor

@DukePaulAtreid3s DukePaulAtreid3s commented Sep 3, 2024

Summary

Balance "Add the machete to relevant lootgroups."

Purpose of change

I was scrolling through the HHG, and realized that the common household machete, most often used for brush clearing and landscaping, was absurdly rare. This PR adds it to the relevant lootgroups.

Describe the solution

Adds it to the gardening tools, hand tools, and household tools loot lists.

Describe alternatives you've considered

not doing that

Testing

Additional context

I don't know why it says there are 90 commits included, all I know is that this only changes 1 file.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map Game: Balance Balancing of (existing) in-game features. labels Sep 3, 2024
@DukePaulAtreid3s
Copy link
Contributor Author

What the hell?

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 3, 2024
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Sep 3, 2024
@DukePaulAtreid3s
Copy link
Contributor Author

Basic build test was being stupid.

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 3, 2024
@RedMisao
Copy link
Contributor

RedMisao commented Sep 3, 2024

Uhh, I'm guessing you PR'd this from the same branch you used to make the FBI profession? Regarding the 90 empty commits

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 4, 2024
@DukePaulAtreid3s
Copy link
Contributor Author

Why do you keep randomly failing the tests?

@akrieger
Copy link
Member

akrieger commented Sep 5, 2024

I can honestly say I've never encountered a gardening machete in the US before, but that's fine.

@akrieger
Copy link
Member

akrieger commented Sep 5, 2024

Is there any chance you can clean up the commit stack to remove all the extraneous ones?

@DukePaulAtreid3s
Copy link
Contributor Author

DukePaulAtreid3s commented Sep 5, 2024

Is there any chance you can clean up the commit stack to remove all the extraneous ones?

I have no idea how, I tried purging my master file and it didn't work. I will avoid using master after this, but I don't have any recourse to fix it in the moment. Luckily it only alters the one file, so it should be good to go

@akrieger
Copy link
Member

akrieger commented Sep 5, 2024

With your permission I can try to fix it myself. (I mean, I have permission, it's a checkbox when you open the PR, but it's not usually used for this).

@DukePaulAtreid3s
Copy link
Contributor Author

With your permission I can try to fix it myself.

That would be lovely!

DukePaulAtreid3s and others added 2 commits September 5, 2024 14:18
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@akrieger akrieger merged commit 7d7dd4b into CleverRaven:master Sep 6, 2024
17 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Game: Balance Balancing of (existing) in-game features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants