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

Revert "Add mansion basecamp" (merged to wrong branch) #49356

Conversation

anothersimulacrum
Copy link
Member

@anothersimulacrum anothersimulacrum commented Jun 18, 2021

Summary

None

Reverts #49241 - it was meant to be merged to 0.F-dev, not master.

After this is merged, I can make another one reverting it into 0.F-dev

@actual-nh actual-nh added (P2 - High) High priority (for ex. important bugfixes) <Bugfix> This is a fix for a bug (or closes open issue) labels Jun 18, 2021
@esotericist esotericist merged commit d621b66 into CleverRaven:master Jun 18, 2021
@anothersimulacrum anothersimulacrum deleted the revert-49241-basecamp_mansion branch June 18, 2021 15:17
anothersimulacrum added a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jun 18, 2021
anothersimulacrum added a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jun 18, 2021
anothersimulacrum added a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jun 18, 2021
ZhilkinSerg added a commit that referenced this pull request Jun 21, 2021
ZhilkinSerg added a commit that referenced this pull request Jul 3, 2021
anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) (P2 - High) High priority (for ex. important bugfixes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants