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.

Sign up for GitHub

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

Jump to bottom

Cyborg Update #461

Closed
wants to merge 6 commits into from
Closed

Cyborg Update #461

wants to merge 6 commits into from

Conversation

FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan commented Jan 7, 2025 •
edited
Loading

Description

Description.

TODO

  • Borg Type Switching
  • Addtional Cyborg
  • Base Security Cyborg

Changelog

🆑

  • add:

@FoxxoTrystan FoxxoTrystan self-assigned this Jan 7, 2025
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Jan 7, 2025
@FoxxoTrystan FoxxoTrystan added Status: Do Not Merge Do not merge Priority: 1-High Needs to be resolved as soon as possible and removed Status: Needs Review Someone please review this labels Jan 7, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 7, 2025 •
edited
Loading

RSI Diff Bot; head commit f77d756 merging into a625a1f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Actions/actions_borg.rsi

State Old New Status
select-type Added

Edit: diff updated after f77d756

@fenndragon
Copy link
Contributor

Test fails appear valid. Borg module recipes throwing errors

@FoxxoTrystan
Copy link
Collaborator Author

They are valid but why the hell is map files having that? instead of actully updating right?

Again this is under do not merge as im not finished with this PR, just needed some errors logs.

@FoxxoTrystan FoxxoTrystan marked this pull request as draft January 8, 2025 03:46
@fenndragon
Copy link
Contributor

They are valid but why the hell is map files having that? instead of actully updating right?

Again this is under do not merge as im not finished with this PR, just needed some errors logs.

oh, sorry, it wasn't a draft so I didn't really know the difference, was just trying to be helpful

@FoxxoTrystan
Copy link
Collaborator Author

They are valid but why the hell is map files having that? instead of actully updating right?
Again this is under do not merge as im not finished with this PR, just needed some errors logs.

oh, sorry, it wasn't a draft so I didn't really know the difference, was just trying to be helpful

is gud

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 9, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 9, 2025

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

@github-actions github-actions bot added Status: Merge Conflict FIX YOUR PR AAAGH and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Jan 9, 2025
@github-actions GitHub Actions
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Awaiting requested review from Fansana Fansana is a code owner

@Memeji Memeji Awaiting requested review from Memeji Memeji is a code owner

@Mnemotechnician Mnemotechnician Awaiting requested review from Mnemotechnician Mnemotechnician is a code owner

Assignees

@FoxxoTrystan FoxxoTrystan

Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Do Not Merge Do not merge Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FoxxoTrystan @fenndragon