Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,7 @@ selectable-set-corpsman-combathardsuit-desc =
Older model of corpsman's hardsuit.
Built based on designs recovered from Regalis sector.
Offers much better armor then newer models.

# BSO
bso-non-lethal-kit-name = Non-lethal Kit
bso-non-lethal-kit-desc = A set designed specifically for non-lethal disposal of threats.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- BSOChesterSet
- BSOSyringeSet
- BSOBRDISet # Omu
- BSONonLethalSet #
maxSelectedSets: 2


Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Omu/Catalog/selectable_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,17 @@
state: icon
content:
- ClothingOuterHardsuitCorpsman

#bso
- type: selectableSet
id: BSONonLethalSet
name: bso-non-lethal-kit-name
description: bso-non-lethal-kit-desc
sprite:
sprite: _Goobstation/Objects/Weapons/Melee/telebaton.rsi
state: icon
content:
- WeaponAdvancedDisablerSMG
- TelescopicBatonAdvanced
- WeaponDisablerAdvanced
- HyperFlash
Comment on lines +257 to +260
Copy link
Contributor

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.

Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,27 @@
tags:
- EnergyMagAmmo
- AdvancedEnergyMagAmmo

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

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

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

parent: [ WeaponDisablerSMG, BaseCentcommContraband ]
id: WeaponAdvancedDisablerSMG
description: An advanced disabler SMG meant for nonlethally disposing of threats to priority personnel.
components:
- type: Sprite
sprite: _Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-0
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: ProjectileBatteryAmmoProvider
proto: BulletDisablerSmg
fireCost: 25
- type: PacifismAllowedGun
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 18
autoRechargePause: true
autoRechargePauseTime: 4
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/26818af618762ff52319b3417be8cdc1279e99b7/icons/obj/weapons/guns/energy.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "mag-unshaded-4"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-0",
"delays": [
[
0.4,
0.4
]
]
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-left-0"
},
{
"name": "inhand-left-1"
},
{
"name": "inhand-left-2"
},
{
"name": "inhand-left-3"
},
{
"name": "inhand-left-4"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-right-0"
},
{
"name": "inhand-right-1"
},
{
"name": "inhand-right-2"
},
{
"name": "inhand-right-3"
},
{
"name": "inhand-right-4"
}
]
}
Loading