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 Loadout Restriction #195

Closed
wants to merge 2 commits into from
Closed

Conversation

Fansana
Copy link
Owner

@Fansana Fansana commented Sep 20, 2024

Description

Removed loadout restrictions for command and security

Description.


Changelog

🆑

  • remove: Removed loadout restrictions for command and security

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Sep 20, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 20, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Remove loadout restriction Remove Loadout Restriction Sep 20, 2024
Copy link
Contributor

@ShatteredSwords ShatteredSwords left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The best thing to do instead of removing all of those lines is to comment all of them out, just so we don't have to deal with a headache when we pull from upstream and something in the loadout changes

@FoxxoTrystan
Copy link
Collaborator

Confllict merge need to be resolved, and yeah, tho merges should not add back removed lines unless edited, tho this will mostly create another conflict to fix.

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Sep 20, 2024
@Fansana Fansana closed this Sep 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants