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

Remove erroneous traits from recruitable Godco NPCs #63831

Merged
merged 39 commits into from
Feb 28, 2023

Conversation

MNG-cataclysm
Copy link
Contributor

Summary

Bugfixes "Remove erroneous AI traits from recruitable Godco NPCs."

Purpose of change

Two recruitable NPCs have the ‘RETURN_TO_START_POS’ flag, keeping them from following the player when recruited. This will fix that.

Describe the solution

Remove the flag from Zachary Taylor and Jane Schulz.

Describe alternatives you've considered

None.

Testing

Went to Godco, did some work, and took two NPCs along with me. It all worked out.

Additional context

None.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) labels Feb 28, 2023
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Feb 28, 2023
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Feb 28, 2023
@Maleclypse
Copy link
Member

I just realized you have the same commit history problem I used to have. Goto dev help sometime and get them to help you reset your master to cleverraven’s master and there is a new GitHub desktop feature that will make your new branches off cleverraven directly which will clean up your commit history. It makes creating a coherent commit stream so much easier. I still mostly only do it on my c++ changes if I remember to do it but when I remember to do it, it looks good.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 28, 2023
@kevingranade kevingranade merged commit f40f852 into CleverRaven:master Feb 28, 2023
@MNG-cataclysm MNG-cataclysm deleted the godco_trait_fix branch February 28, 2023 12:50
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 <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants