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

Legcuffs work #5696

Merged
merged 10 commits into from
May 9, 2024
Merged

Legcuffs work #5696

merged 10 commits into from
May 9, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Feb 10, 2024

About the pull request

Allows legcuffs to function without needing to be beartraps.

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
code: Repaths handcuffs and legcuffs to have a shared parent.
code: Repaths xeno restraints to reduce confusion from the typepath.
add: Legcuffs work appropriately now, and can be found in small numbers within security vendors.
add: Cable restraints can now be adjusted via right-click to fit on wrists or ankles.
add: Prison shoe chains now require ankle restraints rather than handcuffs.
add: Prison shoes that have been chained now have an equp and unequip delay to account for the chains, proportionate to the breakout time of the item used in the chains.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Feb 10, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Feb 18, 2024
code/game/objects/items/legcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/legcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/legcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/legcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/legcuffs.dm Outdated Show resolved Hide resolved
code/game/objects/items/legcuffs.dm Show resolved Hide resolved
@harryob harryob marked this pull request as draft February 21, 2024 04:00
@github-actions github-actions bot closed this Feb 29, 2024
@realforest2001 realforest2001 reopened this Mar 9, 2024
@realforest2001 realforest2001 marked this pull request as ready for review March 9, 2024 18:45
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Mar 9, 2024
cm13-github added a commit that referenced this pull request Mar 9, 2024
cm13-github added a commit that referenced this pull request Mar 9, 2024
cm13-github added a commit that referenced this pull request Mar 10, 2024
maps/map_files/BigRed/BigRed.dmm Outdated Show resolved Hide resolved
cm13-github added a commit that referenced this pull request Mar 11, 2024
@ATP2333REAL ATP2333REAL mentioned this pull request Mar 11, 2024
3 tasks
cm13-github added a commit that referenced this pull request Mar 12, 2024
cm13-github added a commit that referenced this pull request Mar 13, 2024
cm13-github added a commit that referenced this pull request Mar 13, 2024
@Lagomorphica Lagomorphica mentioned this pull request Mar 13, 2024
3 tasks
cm13-github added a commit that referenced this pull request Mar 14, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Mar 19, 2024
@github-actions github-actions bot closed this Mar 31, 2024
@realforest2001 realforest2001 reopened this May 6, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label May 6, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label May 6, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

cm13-github added a commit that referenced this pull request May 6, 2024
cm13-github added a commit that referenced this pull request May 6, 2024
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label May 7, 2024
cm13-github added a commit that referenced this pull request May 8, 2024
cm13-github added a commit that referenced this pull request May 8, 2024
cm13-github added a commit that referenced this pull request May 8, 2024
cm13-github added a commit that referenced this pull request May 8, 2024
cm13-github added a commit that referenced this pull request May 9, 2024
cm13-github added a commit that referenced this pull request May 9, 2024
cm13-github added a commit that referenced this pull request May 9, 2024
@harryob harryob added this pull request to the merge queue May 9, 2024
Merged via the queue into cmss13-devs:master with commit e8c7ca6 May 9, 2024
26 checks passed
cm13-github added a commit that referenced this pull request May 9, 2024
@realforest2001 realforest2001 deleted the forest/legcuffs branch May 10, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants