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

Clumsy system refactor #31147

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Clumsy system refactor #31147

wants to merge 25 commits into from
+455 −289

Conversation

beck-thompson
Copy link
Contributor

@beck-thompson beck-thompson commented Aug 18, 2024 •
edited
Loading

About the PR

The clumsy system was just hard coded into a lot of places. Now the clumsy system uses events that it can interact with instead!

Technical details

As above, I mostly just made events where there weren't before and made the clumsy system hook into them and listen and interact with them. Specifically, the gun system, defib system, hypospray system, and climb on thing system.

Media

2024-08-17.20-46-35.mp4
  • All chances are 50/50 I just got unlucky.

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

If you hard coded clumsy stuff into important systems please trigger events and listen for them in the clumsy system now!

Changelog

🆑 Beck Thompson

  • tweak: Minor tweaks to clumsiness. Some of the timings and or noises have been changed slightly!

@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Aug 18, 2024
@beck-thompson beck-thompson changed the title First commit Clumsy system refactor Aug 18, 2024
@beck-thompson
Copy link
Contributor Author

OK looks like I forgot that tables made a special sound 😭
I'll fix that tomorrow because its gonna require a few annoying changes...

This was referenced Aug 19, 2024
Closed
Open
0x6273
0x6273 suggested changes Sep 2, 2024
View reviewed changes
Content.Shared/Clumsy/ClumsyComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Outdated Show resolved Hide resolved
Content.Shared/Climbing/Events/BeforeClimbEvents.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Show resolved Hide resolved
@beck-thompson beck-thompson mentioned this pull request Sep 5, 2024
Open
2 tasks
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 8, 2024

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

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 8, 2024
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 10, 2024
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 26, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 26, 2024
@Plykiya
Copy link
Contributor

Plykiya commented Oct 10, 2024

I guess I'll give this a look since it's kind of blocking gun executions as well?

@beck-thompson
Copy link
Contributor Author

I guess I'll give this a look since it's kind of blocking gun executions as well?

If you need me to make any changes that would make the gun executions easier, just let me know and I can do em!

@SaphireLattice
Copy link
Contributor

Ooh... this makes it possible to make a system that would block hyposprays from injecting through hardsuits, for example, if I read this right. I like this! And yay removing unrelated fields from components.

@beck-thompson
Copy link
Contributor Author

Hopefully that's better! The defib system in general is very confusing...

slarticodefast
slarticodefast requested changes Oct 24, 2024
View reviewed changes
Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs Outdated Show resolved Hide resolved
Content.Server/Administration/Systems/SuperBonkSystem.cs Outdated Show resolved Hide resolved
Content.Server/Administration/Systems/SuperBonkSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Chemistry/Events/HyposprayEvents.cs Outdated Show resolved Hide resolved
Content.Shared/Climbing/Components/BonkableComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Medical/DefibrillatorEvents.cs Outdated Show resolved Hide resolved
Content.Server/Medical/DefibrillatorSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Outdated Show resolved Hide resolved
Content.Shared/Clumsy/ClumsySystem.cs Outdated Show resolved Hide resolved
@slarticodefast slarticodefast added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Oct 24, 2024
@slarticodefast slarticodefast self-assigned this Oct 24, 2024
@beck-thompson
Copy link
Contributor Author

OK think I fixed all that! Let me know if you need anything else or if I missed something 🫡

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

@0x6273 0x6273 0x6273 requested changes

@slarticodefast slarticodefast slarticodefast requested changes

@metalgearsloth metalgearsloth metalgearsloth approved these changes

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

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

@Chief-Engineer Chief-Engineer Awaiting requested review from Chief-Engineer Chief-Engineer is a code owner

Requested changes must be addressed to merge this pull request.

Assignees

@slarticodefast slarticodefast

Labels
Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@beck-thompson @Plykiya @SaphireLattice @metalgearsloth @0x6273 @slarticodefast