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

Stun Sabres #550

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Conversation

KittenColony
Copy link
Contributor

@KittenColony KittenColony commented Feb 7, 2025

About the PR

Adds a new stun baton for Security; the Stun sabre

Why / Balance

Mechanically, its a stun baton with its own sheath, objectively worse then the other options due to only holding the sabre

Technical details

YAML & Sprites

Media

image

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑

Add: Added a new stun sabre for security.

@KittenColony
Copy link
Contributor Author

for build checks

Copy link
Contributor

github-actions bot commented Feb 7, 2025

RSI Diff Bot; head commit 21c4096 merging into a42cec2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CD/Clothing/Belt/stunsheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/_CD/Objects/Weapons/Melee/stunsabre.rsi

State Old New Status
off-inhand-left Added
off-inhand-right Added
on-inhand-left Added
on-inhand-right Added
stunsabre_off Added
stunsabre_on Added

Edit: diff updated after 21c4096

@KittenColony
Copy link
Contributor Author

Ready to merge assuming all checks pass

Copy link
Collaborator

@dffdff2423 dffdff2423 left a comment

Choose a reason for hiding this comment

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

Mainly just summarizing what Nair and I said on discord. Not sure if Lank has anything to say or if he disagrees.

  • Should not be accessible to security round start because the sabre is a very distinct item belonging to the captain.
  • Is alright as salvage loot and for CentCom/Admin usage.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants