Skip to content

BSO nonlethals set (Bounty)#638

Open
Giltsmith wants to merge 4 commits intoProjectOmu:masterfrom
Giltsmith:r3stful-bounty
Open

BSO nonlethals set (Bounty)#638
Giltsmith wants to merge 4 commits intoProjectOmu:masterfrom
Giltsmith:r3stful-bounty

Conversation

@Giltsmith
Copy link
Contributor

@Giltsmith Giltsmith commented Mar 2, 2026

About the PR

Added a new BSO kit, nonlethal. CentComm Disabler, (new) CentComm disabler SMG, hypercharged flash, disciplinary baton.

Why / Balance

Bounty.

Technical details

Straight yamlslop. Tried to make sure everything is in the right place please tell me if I missed anything.

Media

Content.client.2026.03.02.-.23.42.23.02.2.1.mp4

Requirements

Breaking changes

None AFAIK. Gonna be merge conflicts with the BSO rework coming soon but I'll fix em when they show up (should be one line of yaml to change).

Changelog
🆑

  • add: Added a BSO nonlethal kit. Death to validhunting!

@github-actions github-actions bot added Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. S: Untriaged Has not been set a status; currently not labeled. labels Mar 2, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Mar 2, 2026 •
edited
Loading

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

Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi

State Old New Status
base Added
inhand-left-0 Added
inhand-left-1 Added
inhand-left-2 Added
inhand-left-3 Added
inhand-left-4 Added
inhand-left Added
inhand-right-0 Added
inhand-right-1 Added
inhand-right-2 Added
inhand-right-3 Added
inhand-right-4 Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Edit: diff updated after f1fb592

@3PonPon3 3PonPon3 added S: Needs Review Needs review by a maintainer. Note: Bounty A pull-request made for a bounty or other offer. Type: Feature Adds completely new stuff to the game. and removed S: Untriaged Has not been set a status; currently not labeled. labels Mar 6, 2026
raincally and others added 2 commits March 6, 2026 13:07
raincally
raincally reviewed Mar 6, 2026
View reviewed changes
Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
- AdvancedEnergyMagAmmo

- type: entity
name: CentComm Disabler SMG
Copy link
Contributor

@raincally raincally Mar 6, 2026

Choose a reason for hiding this comment

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

kind of a nitpick but i think u should change it to advanced disabler SMG
just so it matches the normal cc disabler,,, also because using caps in an items name can feel weird sometimes

Copy link
Contributor Author

@Giltsmith Giltsmith Mar 7, 2026

Choose a reason for hiding this comment

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

truthloose
will do when i get home from work then

@Sammyy03
Copy link

Sammyy03 commented Mar 8, 2026 •
edited
Loading

A bodyguard having non-lethals exclusively is already a joke in of its own. The fact that the items are a self recharge SMG disabler and the centcomm disabler is...a set of choices I do not like

NotActuallyMarty
NotActuallyMarty requested changes Mar 19, 2026
View reviewed changes
Copy link
Contributor

@NotActuallyMarty NotActuallyMarty left a comment

Choose a reason for hiding this comment

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

You can keep the self recharging SMG for the sake of having it for future additions.

However It'd be overkill to add it to the kit.

Hyperflash is do not map.

self recharge disabler i'd be fine with if it is the only stun option included in the kit, given the precedent of NTR having one, however i'd preffer alternatives.

I recommend reworking the kit so there is some form of counterplay or resource requirement, instead of giving self recharging options.

i.e. Standard Disabler SMG, Stun baton, Extra flashbangs, Standard flash.

Resources/Prototypes/_Omu/Catalog/selectable_sets.yml
Comment on lines +257 to +260
- WeaponAdvancedDisablerSMG
- TelescopicBatonAdvanced
- WeaponDisablerAdvanced
- HyperFlash
Copy link
Contributor

@NotActuallyMarty NotActuallyMarty Mar 19, 2026

Choose a reason for hiding this comment

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

Hyperflash is a 20+ second flash that is tagged as do not map for a reason.

self recharge disabler would be fine by itself, not if given alongside a disabler SMG, and not if given alongside a self recharging SMG either.

I don't believe the self recharge SMG fits in anywhere without a significant rework in points cost of BSO.

@github-actions github-actions bot removed the S: Needs Review Needs review by a maintainer. label Mar 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@raincally raincally raincally left review comments

@NotActuallyMarty NotActuallyMarty NotActuallyMarty requested changes

+1 more reviewer

@3PonPon3 3PonPon3 3PonPon3 left review comments

Reviewers whose approvals may not affect merge requirements

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

Changes: No C# Purely YAML/non-C#. Changes: Sprites Makes changes to sprites/RSIs. Note: Bounty A pull-request made for a bounty or other offer. size/M Type: Feature Adds completely new stuff to the game.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Giltsmith @Sammyy03 @NotActuallyMarty @3PonPon3 @raincally @OmuStationBot