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

tweaks to random spawners #3644

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Oct 25, 2024

About The Pull Request

Main part of the pr is tweaking the exotic maint loot to be much less cruft
Few minor repaths
Removal of a few cruft items/spawners

Why It's Good For The Game

Changelog

🆑
add: Wallets now use a random spawner
del: Removed a few cruft items/spawners
balance: Exotic loot is alot less cruft
/:cl:

@FalloutFalcon FalloutFalcon requested a review from a team as a code owner October 25, 2024 23:07
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Ship Ship successfully tested. Code change Watch something violently break. Ruin Ruin successfully tested. labels Oct 25, 2024
@generalthrax
Copy link
Contributor

Can you split off the repaths to a different pr? It'll probably fuck up a lot of maps that I have a feeling this doesn't address.

@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 26, 2024

Repaths are breaking a ton of maps. Please make sure they're fixed before merging this and/or split them into a separate PR so the meat of it can go through, because this isn't the first repath that's caused this problem. ideally that particular problem should be addressed before repath PRs are even test merged due to the effect they can have on a round.

@FalloutFalcon
Copy link
Member Author

FalloutFalcon commented Oct 26, 2024

I just skimmed the ruins and none of them use the salvage spawners i repathed.

@generalthrax
Copy link
Contributor

generalthrax commented Oct 26, 2024

scarab is one. split it off so we can get this Fix It As Soon As Possible i dont want another 3 "i got dusted by the die of fate" tickets or seeing people with the double speed jackboots

@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 26, 2024

Ough, yeah, Scarab isn't fullmerged yet, that would explain it. I think we should be very careful about test merging repaths and map PRs at the same time in the future if the bugged tiles thing is going to be the result every time they conflict. Or just not do that, ever, as a blanket rule. Repath PRs are usually fairly speedy merges and the resulting merge conflicts will put affected maps out of commission until they're fixed, but it's better than things breaking live on the server.

@FalloutFalcon
Copy link
Member Author

Ough, yeah, Scarab isn't fullmerged yet, that would explain it. I think we should be very careful about test merging repaths and map PRs at the same time in the future if the bugged tiles thing is going to be the result every time they conflict. Or just not do that, ever, as a blanket rule. Repath PRs are usually fairly speedy merges and the resulting merge conflicts will put affected maps out of commission until they're fixed, but it's better than things breaking live on the server.

Repaths, almost never need testmerges.

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 Use Git Hooks, you're welcome. label Oct 26, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

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

repathings will continue until morale improves

(please fix checks and merge conflicts)

Copy link
Contributor

This PR has been inactive for a month. This means it is at risk of being auto closed in a week, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale All falls to entropy eventually. label Dec 11, 2024
@github-actions github-actions bot closed this Dec 19, 2024
@FalloutFalcon FalloutFalcon reopened this Dec 30, 2024
@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. Ruin Ruin successfully tested. labels Dec 30, 2024
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner December 30, 2024 00:37
@github-actions github-actions bot added Ruin Ruin successfully tested. and removed Stale All falls to entropy eventually. labels Dec 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Ship Ship successfully tested.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants