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

Shock Collar Tweak #546

Merged
merged 3 commits into from
Jul 14, 2024

Conversation

Mnemotechnician
Copy link
Contributor

Description

Shock collars were a useful thing in nyano for a long time, but security could never put them to use because they could be removed instantly, so they were forgotten about.

Now that we have enquip delays, shock collars can be useful for controlling unruly prisoners (or unruly secoffs who like to harm baton passengers). Only two problems is there's no way to manufacture them, and they can be quite deadly when used repeatedly. This PR solves both of these issues, and also fixes a little bug:

  • Shock collars can be manufactured at the secfab.
  • Shock collars deal 1 shock damage instead of 5.
  • The shock ignores insulation.

Media

image


Changelog

🆑

  • tweak: Shock collars can now be manufactured in the security techfab. They also deal less damage and ignore insulated gloves.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Jul 13, 2024
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Interesting to see it had a lathe recipe but was never used.. I wonder why?

@github-actions github-actions bot added Status: Needs Review Someone please review this labels Jul 13, 2024
@DangerRevolution DangerRevolution added Priority: 4-Low Should be resolved at some point Size: 5-Very Small For especially small issues/PRs Type: Cleanup Like Rework but small labels Jul 13, 2024
@VMSolidus VMSolidus merged commit 964ed8f into Simple-Station:master Jul 14, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Size: 5-Very Small For especially small issues/PRs Status: Needs Review Someone please review this Type: Cleanup Like Rework but small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants