-
Notifications
You must be signed in to change notification settings - Fork 537
Add Grappling for Laika #4157
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
Open
BarryNorfolk
wants to merge
9
commits into
DeltaV-Station:master
Choose a base branch
from
BarryNorfolk:k9/grappling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add Grappling for Laika #4157
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7bb6e13
to
186b4c5
Compare
comes pre approved |
actually hold the phone |
Yeah I would go over the numbers at least to make sure things feel right or decent. |
Direction approved and good to merge |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
faf2e11
to
080ba02
Compare
for more information, see https://pre-commit.ci
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Audio
Changes any audio files
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
S: Needs Review
size/L
256-1023 lines
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Added a new grappling system that disables hands, much the same as from cuffing, and throws the grappled person prone.
Why / Balance
See discord thread in #design-documents for more information as to why.
This is targeted mostly towards allowing Laika (and Secdogs in general) to detain suspects for an amount of time, without having to resort to bleeding/hurting.
The overall details are:
Technical details
Originally this was all part of #3842 but given the slowness I have at the moment, I wanted to try and get SOME bits and pieces of it in now rather than much much later.
I think the vast majority of this is self contained and straight forward to review, it's a bit more generalised than JUST for laika since I think it could be fun for some admemers.
Media
From Laika's perspective:
Laika.webm
From the victim's perspective:
Victim.webm
Requirements
Breaking changes
Changelog
🆑