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

Add Ballistic Stun Taser to Sheriff and Deputy #2612

Merged
merged 1 commit into from
Jul 8, 2023

Conversation

ZeroNetAlpha
Copy link
Contributor

About The Pull Request

Adds the stock ss13 hardstun taser to Nash Sheriff and Deputy as well as the stunbaton in replacement of the sheriff's telescoping baton.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
add: Add /obj/item/gun/energy/taser to Sheriff and Deputy loadouts
add: Add /obj/item/melee/baton/loaded (stunbaton) to Sheriff loadout.
del: Removed /obj/item/melee/classic_baton from Sheriff loadout.
/:cl:

@Tk420634 Tk420634 merged commit 8d61fbb into ARF-SS13:master Jul 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants