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

Revert "Merge pull request #505 from Mnemotechnician/floof/cherrypick… #534

Closed
wants to merge 3 commits into from
Closed

Revert "Merge pull request #505 from Mnemotechnician/floof/cherrypick… #534

wants to merge 3 commits into from

Conversation

fenndragon
Copy link
Contributor

…/ee-2024-01-21"

This reverts commit e6e3087, reversing changes made to 9676430.

Description

temporary hotfix, disabling surgery and limb targeting until it gets into a more complete and finished state.

Changelog

🆑

  • remove: Removed Surgery

@fenndragon
Revert "Merge pull request Fansana#505 from Mnemotechnician/floof/che…
6006f7b 
…rrypick/ee-2024-01-21"

This reverts commit e6e3087, reversing
changes made to 9676430.
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Feb 6, 2025
@Mnemotechnician
Copy link
Collaborator

This does not even revert surgery. This reverts the "merges and cherry-picks from EE" PR. Besides that, we are working on fixing and polishing the issues with new medical, look at https://github.com/Fansana/floofstation1/pulls.

@fenndragon
Copy link
Contributor Author

This does not even revert surgery. This reverts the "merges and cherry-picks from EE" PR. Besides that, we are working on fixing and polishing the issues with new medical, look at https://github.com/Fansana/floofstation1/pulls.

this was requested by Seb, Nori, and Tech. you're telling me it doesn't revert surgery despite removing it from the game?

@Mnemotechnician
Copy link
Collaborator

this was requested by Seb, Nori, and Tech. you're telling me it doesn't revert surgery despite removing it from the game?

Yeah, it literally does not remove it and in fact doesn't even touch any single file belonging to surgery.

@Mnemotechnician Mnemotechnician added Status: Do Not Merge Do not merge Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team. labels Feb 6, 2025
@fenndragon
Copy link
Contributor Author

this was requested by Seb, Nori, and Tech. you're telling me it doesn't revert surgery despite removing it from the game?

Yeah, it literally does not remove it and in fact doesn't even touch any single file belonging to surgery.

my mistake, for some reason my dev environment did not update the PR correctly with all changes, one moment

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 6, 2025

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 Feb 6, 2025
@fenndragon
Copy link
Contributor Author

there that should cover all of it

@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: Config Changes any configuration files Changes: Documentation Changes any xml or md files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Feb 6, 2025
@fenndragon
Copy link
Contributor Author

I see now. you put commits into the update that weren't part of any PRS. I'm having to remove the entire release.

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

github-actions bot commented Feb 6, 2025

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

@github-actions github-actions bot added Changes: Workflow Changes any GitHub workflow files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Feb 6, 2025
@Fansana Fansana closed this Feb 6, 2025
@Fansana
Copy link
Owner

Fansana commented Feb 6, 2025

We are going to work on fixing the issues instead of reverting

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

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

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

Assignees
No one assigned
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Config Changes any configuration files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files Status: Do Not Merge Do not merge Status: Needs Review Someone please review this Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fenndragon @Mnemotechnician @Fansana