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

combat code overhaul + projectiles v8: impact handling #6579

Merged
merged 205 commits into from
Sep 2, 2024
Merged

combat code overhaul + projectiles v8: impact handling #6579

merged 205 commits into from
Sep 2, 2024

Conversation

silicons
Copy link
Contributor

@silicons silicons commented Jul 6, 2024 •
edited
Loading

refactors hit handling to be a lot more sane, basically.

this'll be a bit bigger than #6544 unfortunately.

  • adds new shieldcall system
  • completely overhauls projectile hit handling
  • adds new armorcall system
  • updates size labelling to work with large prs again
  • misc fixes

closes #6679
closes #6667

@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 6, 2024
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 7, 2024
TheLordME
TheLordME previously approved these changes Aug 29, 2024
View reviewed changes
Copy link
Collaborator

@TheLordME TheLordME left a comment

Choose a reason for hiding this comment

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

Ima be real, when the dif in the .dme is to large for github to show, ill never get through it and actually find faults

TheLordME
TheLordME previously approved these changes Aug 30, 2024
View reviewed changes
silicons pushed a commit that referenced this pull request Aug 31, 2024
TGS Test Merge (#6579)
f00283f
silicons pushed a commit that referenced this pull request Sep 2, 2024
TGS Test Merge (#6579)
bc67c77
silicons pushed a commit that referenced this pull request Sep 2, 2024
TGS Test Merge (#6579)
f81ab7d
@TheLordME TheLordME merged commit 2533cae into Citadel-Station-13:master Sep 2, 2024
6 of 7 checks passed
@VoRe-bot VoRe-bot mentioned this pull request Sep 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheLordME TheLordME TheLordME approved these changes

@BlueWildrose BlueWildrose BlueWildrose left review comments

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

Assignees
No one assigned
Labels
size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. Test Merge Candidate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@silicons @BlueWildrose @TheLordME