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

Generalizing handcuff resist code. #4470

Merged

Conversation

MistakeNot4892
Copy link
Contributor

Description of changes

  • Generalizes handcuff resist code to /mob/living and /obj/item.
  • Adds resist time to straightjackets.

Why and what will this PR improve

Addresses #4378 and ScavStation/ScavStation#1043.

Authorship

Myself.

Changelog

🆑
tweak: You can now resist out of straightjackets.
/:cl:

@MistakeNot4892 MistakeNot4892 added the ready for review This PR is ready for review and merge. label Sep 17, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the tweak/straightjacket_resist branch 4 times, most recently from 2270c32 to 0f7729d Compare September 21, 2024 01:48
out-of-phaze
out-of-phaze previously approved these changes Sep 21, 2024
@@ -24,6 +24,10 @@
attached_shoes.remove_cuffs()
. = ..()

/obj/item/Initialize(ml, material_key)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops

Copy link
Member

Choose a reason for hiding this comment

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

oops

@out-of-phaze out-of-phaze merged commit a013ccd into NebulaSS13:dev Sep 22, 2024
13 checks passed
Atermonera pushed a commit to Atermonera/Polaris-Neb that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants