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.

Sign up for GitHub

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

Jump to bottom

Longarms Require Wielding #913

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Longarms Require Wielding #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a35a561
Longarms Require Wielding
VMSolidus Sep 12, 2024
9a63a76
Update shotguns.yml
VMSolidus Sep 20, 2024
8b379a3
Merge branch 'master' into Longarms-Require-Wielding
VMSolidus Sep 20, 2024
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
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
slots:
- Back
- type: Wieldable
- type: GunRequiresWield
- type: GunWieldBonus
minAngle: -20
maxAngle: -20
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
slots:
- Back
- suitStorage
- type: Wieldable
- type: GunRequiresWield
- type: AmmoCounter
- type: Gun
fireRate: 5
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@
soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg
fireOnDropChance: 0.3
- type: Wieldable
- type: GunRequiresWield
- type: ItemSlots
slots:
gun_magazine:
Expand Down Expand Up @@ -118,6 +120,8 @@
- type: Gun
fireRate: 2
fireOnDropChance: 0.5
- type: Wieldable
- type: GunRequiresWield
- type: BallisticAmmoProvider
capacity: 2
- type: Construction
Expand Down Expand Up @@ -146,6 +150,8 @@
- type: Clothing
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V
- type: BallisticAmmoProvider
- type: Wieldable
- type: GunRequiresWield

- type: entity
parent: WeaponShotgunEnforcer
Expand Down Expand Up @@ -176,6 +182,8 @@
- type: Tag
tags:
- WeaponShotgunKammerer
- type: Wieldable
- type: GunRequiresWield

- type: entity
name: sawn-off shotgun
Expand Down Expand Up @@ -260,6 +268,8 @@
capacity: 1
- type: StaticPrice
price: 0
- type: Wieldable
- type: GunRequiresWield

- type: entity
name: improvised shotgun
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Back
- suitStorage
- type: AmmoCounter
- type: Wieldable
- type: GunRequiresWield
- type: Gun
fireRate: 0.75
selectedMode: SemiAuto
Expand Down
Loading