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

UPP surv redo and removing ambiguous text #4576

Merged
merged 1 commit into from
Oct 3, 2023

Conversation

morrowwolf
Copy link
Member

@morrowwolf morrowwolf commented Oct 2, 2023

About the pull request

The previous UPP surv changes got undone in a soft conflict while moving things around so they're back.

The removed text creates a feeling of possibly the USCM are hostile but this is never the case and UPP are explicitly not hostile as survivors.

Explain why it's good for the game

Not losing PRs good.

Confusing text bad.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 Morrow
fix: Re-added previous UPP changes that were lost in soft conflict
spellcheck: Removed some ambiguous text about loyalties for UPP survivors
/:cl:

@github-actions github-actions bot added Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors labels Oct 2, 2023
@BeagleGaming1 BeagleGaming1 added this pull request to the merge queue Oct 3, 2023
Merged via the queue into cmss13-devs:master with commit f0c52f7 Oct 3, 2023
27 checks passed
cm13-github added a commit that referenced this pull request Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants