diff --git a/Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl b/Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl index 8af55f35ba5..c38144096da 100644 --- a/Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl +++ b/Resources/Locale/en-US/_Omu/set-selector/selectable-sets.ftl @@ -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. diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml index fb10b0e5a91..524f13bdb8f 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/CentralCommand/set_selectors.yml @@ -32,6 +32,7 @@ - BSOChesterSet - BSOSyringeSet - BSOBRDISet # Omu + - BSONonLethalSet # Omu maxSelectedSets: 2 diff --git a/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml b/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml index d55b0d8184e..9ecf4d2d741 100644 --- a/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml +++ b/Resources/Prototypes/_Omu/Catalog/selectable_sets.yml @@ -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 diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 3cf00102d9b..353ab2d5d2f 100644 --- a/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Omu/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -49,3 +49,27 @@ tags: - EnergyMagAmmo - AdvancedEnergyMagAmmo + +- type: entity + name: CentComm Disabler SMG + 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 diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/base.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/base.png new file mode 100644 index 00000000000..00d07a68ad8 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/base.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-0.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-0.png new file mode 100644 index 00000000000..bc69a428f77 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-1.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-1.png new file mode 100644 index 00000000000..6eed937d742 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-2.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-2.png new file mode 100644 index 00000000000..abee01bd56e Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-3.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-3.png new file mode 100644 index 00000000000..f038dcad765 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-4.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-4.png new file mode 100644 index 00000000000..beb1a5c3049 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left-4.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left.png new file mode 100644 index 00000000000..9823fa6885a Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-0.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-0.png new file mode 100644 index 00000000000..5dcbf45e408 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-1.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-1.png new file mode 100644 index 00000000000..942fd9d303b Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-2.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-2.png new file mode 100644 index 00000000000..43dfa224d22 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-3.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-3.png new file mode 100644 index 00000000000..e8a49692c30 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-4.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-4.png new file mode 100644 index 00000000000..b9c0eccb35d Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right-4.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right.png new file mode 100644 index 00000000000..1d84131e2fd Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-0.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..99d7e731933 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-1.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..be58210ecdc Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-2.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..91cf2141e77 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-3.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..c8fc471c450 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-4.png b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..115e28885ab Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/meta.json b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/meta.json new file mode 100644 index 00000000000..6322804e104 --- /dev/null +++ b/Resources/Textures/_Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi/meta.json @@ -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" + } + ] +}