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

Colonial Marshal ERT now uses their own faction #3893

Merged
merged 2 commits into from
Jul 20, 2023

Conversation

morrowwolf
Copy link
Member

@morrowwolf morrowwolf commented Jul 14, 2023

About the pull request

Colonial Marshal ERT now uses their own faction

Anchorpoint marines now use the proper define for USCM

Explain why it's good for the game

I can't find these bastards on the follow menu and they shouldn't instantly have USCM IFF.

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: Colonial Marshal ERT now uses their own faction
fix: Anchorpoint marines now use the proper define for USCM
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jul 14, 2023
@QuickLode
Copy link
Contributor

Please make sure Anchorpoint Marine SG cannot FF Colonial Marshals - They are from the exact same station with the same IFF Codes.

@morrowwolf morrowwolf marked this pull request as draft July 15, 2023 21:56
@morrowwolf
Copy link
Member Author

Gonna pull out the faction groups for this bad boy

@morrowwolf morrowwolf marked this pull request as ready for review July 20, 2023 14:23
@harryob harryob enabled auto-merge July 20, 2023 14:27
@harryob harryob added this pull request to the merge queue Jul 20, 2023
Merged via the queue into cmss13-devs:master with commit 8906366 Jul 20, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Jul 20, 2023
github-actions bot added a commit that referenced this pull request Jul 20, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants