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 the old Evac Center Merchant. #64032

Merged
merged 1 commit into from
Mar 8, 2023

Conversation

MNG-cataclysm
Copy link
Contributor

@MNG-cataclysm MNG-cataclysm commented Mar 7, 2023

Summary

Content "Remove the old evac center merchant."

Purpose of change

The old randomly generated merchant is no longer used and has not appeared since 2021. With the release of 0.G, I believe that it should be removed for the 0.H experimental and stable cycles.

Describe the solution

Remove the old merchant file, and migrate two things to Smokes's file to avoid errors.

Describe alternatives you've considered

Not doing this.

Testing

Removed the file and loaded the game after debugging and went through Smokes's dialouge. No problems at all.

Additional context

None.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON NPC / Factions NPCs, AI, Speech, Factions, Ownership astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 7, 2023
@kevingranade kevingranade merged commit 650f9ae into CleverRaven:master Mar 8, 2023
@MNG-cataclysm MNG-cataclysm deleted the no-old-merchant branch March 8, 2023 03:01
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants