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

Security loadouts rubber magazines #2659

Merged
Merged
Show file tree
Hide file tree
Changes from 3 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
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,51 @@
- type: GuideHelp
guides:
- Cargo

- type: entity
parent: WeaponPistolPollock
id: WeaponPistolPollockNonlethal
suffix: Non-lethal
components:
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolRubber
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistol
gun_chamber:
name: Chamber
startingItem: CartridgePistolRubber
priority: 1
whitelist:
tags:
- CartridgePistol

- type: entity
parent: WeaponPistolSLP57
id: WeaponPistolSLP57Nonlethal
suffix: Non-lethal
components:
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolRubber
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistol
gun_chamber:
name: Chamber
startingItem: CartridgePistolRubber
priority: 1
whitelist:
tags:
- CartridgePistol
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
- type: loadout
id: SecurityFirearmWeaponPistolPollock
equipment:
pocket1: WeaponPistolPollock
pocket1: WeaponPistolPollockNonlethal

- type: loadout
id: SecurityFirearmWeaponPistolSLP57
equipment:
pocket1: WeaponPistolSLP57
pocket1: WeaponPistolSLP57Nonlethal

- type: loadout
id: SecurityFirearmWeaponPistolMk58
equipment:
pocket1: WeaponPistolMk58
pocket1: WeaponPistolMk58Nonlethal

- type: loadout
id: SecurityFirearmWeaponDisabler
Expand Down
Loading