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

Emergency Cyborg Patch #475

Merged
merged 21 commits into from
Jan 10, 2025
Merged

Emergency Cyborg Patch #475

merged 21 commits into from
Jan 10, 2025

Conversation

FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan commented Jan 10, 2025

This Patch adds the following:

#472
#471
#470

This patch is critical due to the round-remove game breaking bugs its fixes.

Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot closed this Jan 10, 2025
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files and removed Status: Needs Review Someone please review this labels Jan 10, 2025
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jan 10, 2025
@FoxxoTrystan FoxxoTrystan added Priority: 1-High Needs to be resolved as soon as possible and removed Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jan 10, 2025
Copy link
Contributor

github-actions bot commented Jan 10, 2025

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

Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi

State Old New Status
energy-inhand-left Added
energy-inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 1a02689

@FoxxoTrystan FoxxoTrystan added the Status: Needs Review Someone please review this label Jan 10, 2025
@FoxxoTrystan FoxxoTrystan reopened this Jan 10, 2025
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jan 10, 2025
@Mnemotechnician Mnemotechnician changed the title Emercency Cyborg Patch Emergency Cyborg Patch Jan 10, 2025
@Memeji Memeji merged commit 10abaeb into stable Jan 10, 2025
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants