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

Mirror: Fix StrippableSystem Blunders #224

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #26166: Fix StrippableSystem blunders from space-wizards space-wizards/space-station-14

8ecb78ee5ac879ef0c79e9c35f3d05e72faf72fd

PR opened by Krunklehorn at 2024-03-16 02:33:20 UTC


PR changed 2 files with 13 additions and 7 deletions.

The PR had the following labels:


Original Body

About the PR

#25994 wasn't airtight. I never thought to test on animals, zombies or dead / crit players.

This PR fixes the following issues:
#26144
#26145
#26150

  • Zombies and animals couldn't be stripped because I was checking for target hands too early
  • Dead/Crit was instantly stripping because I turned the strip time multiplier into a TimeSpan

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 Krunk

  • fix: Zombies and animals can be stripped once again.
  • fix: Dead or critical mobs can no longer be stripped instantly.

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 22, 2024
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

this needs to be tested with Felinids

@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:13
@VMSolidus VMSolidus marked this pull request as ready for review May 29, 2024 00:31
@github-actions github-actions bot added the Changes: C# Changes any cs files label May 29, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 1, 2024
Copy link
Contributor

github-actions bot commented Jul 1, 2024

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 1, 2024
@SimpleStation14 SimpleStation14 changed the title Mirror: Fix StrippableSystem blunders Mirror: Fix StrippableSystem Blunders Jul 1, 2024
@VMSolidus
Copy link
Member

Oh for fucks sakes.

@VMSolidus
Copy link
Member

I accidentally bungled this in a way that's hard to untangle. So I have just made a new PR where I redid the cherrypicks and did the merge conflict handling through VSCode rather than github's web UI. In the future, let's not use the web UI for that lol. It's waaay too easy to screw it up. :trollface:

@VMSolidus VMSolidus closed this Jul 1, 2024
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 Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants