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

Handcuffs Now Require An Aggressive Grab #7299

Merged
merged 19 commits into from May 1, 2020
Merged

Handcuffs Now Require An Aggressive Grab #7299

merged 19 commits into from May 1, 2020

Conversation

Nerev4r
Copy link
Contributor

@Nerev4r Nerev4r commented Oct 30, 2019

as above.

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Oct 30, 2019

!review

@SueTheCake
Copy link
Contributor

The only way to cuff people now is by beating them unconscious, since evidently you can continue to resist even when in paincrit.

No thanks.

@FiePhi
Copy link

FiePhi commented Oct 30, 2019 •
edited

The only way to cuff people now is by beating them unconscious, since evidently you can continue to resist even when in paincrit.

No thanks.

Tested with Para on a private server with a higher resist cooldown, and it's much more reasonable. People who are stunned should be feasible to arrest now. Hopefully we can make it respect pain too, but as is this will be okay. Also as a side effect, resist spam macros will not be so horrendous now.

@Nerev4r @MarinaGryphon
Update html/changelogs/example.yml
6f1b917 
Co-Authored-By: MarinaGryphon <ryfoxx93@gmail.com>
@Nerev4r @MarinaGryphon
Update html/changelogs/example.yml
6c07ea9 
Co-Authored-By: MarinaGryphon <ryfoxx93@gmail.com>
Geevies
Geevies requested changes Oct 30, 2019
View reviewed changes
code/game/objects/items/weapons/handcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/handcuffs.dm Outdated Show resolved Hide resolved
@Nerev4r
Copy link
Contributor Author

Nerev4r commented Nov 1, 2019

i dunno why travis.

@skull132
Copy link
Contributor

skull132 commented Nov 2, 2019

Psure we already had this. And then reverted it because it was undesirable in gameplay.

Arrow768
Arrow768 reviewed Nov 6, 2019
View reviewed changes
Copy link
Member

@Arrow768 Arrow768 left a comment

Choose a reason for hiding this comment

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

That is something that needs to be playtested on a larger scale.

@Arrow768 Arrow768 added the Test Merge Candidate The PR is eligible for test merging. label Nov 6, 2019
@MistakeNot4892
Copy link
Contributor

I just want to point out as an unrelated observer that you have more commits in this PR than there are changed lines of code.

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Apr 14, 2020

slight nerf to resists

@Arrow768
Copy link
Member

Arrow768 commented May 1, 2020

We'll see how that goes. Might need some further tweaks after its merged (i.e. take pain/exhaustion into account when calculating if someone is able to resist).

@Arrow768 Arrow768 merged commit 3d0d55d into Aurorastation:master May 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Arrow768 Arrow768 Arrow768 left review comments

@NonQueueingMatt NonQueueingMatt NonQueueingMatt approved these changes

@MarinaGryphon MarinaGryphon MarinaGryphon left review comments

@Geevies Geevies Geevies approved these changes

Assignees
No one assigned
Labels
Awaiting Merge Test Merge Candidate The PR is eligible for test merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Nerev4r @SueTheCake @FiePhi @skull132 @MistakeNot4892 @Arrow768 @NonQueueingMatt @MarinaGryphon @Geevies @BotBOREALIS