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

Guns will now eject magazines first instead of chamber #8827

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Guns will now eject magazines first instead of chamber #8827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 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 @@ -31,12 +31,14 @@
startingItem: MagazineLightRifleBox
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineLightRifleBox
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifle
priority: 1
whitelist:
tags:
- CartridgeLightRifle
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
startingItem: MagazinePistol
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: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
Expand Down Expand Up @@ -65,13 +67,15 @@
startingItem: MagazinePistol
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistol
- MagazinePistolHighCapacity
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
Expand Down Expand Up @@ -123,12 +127,14 @@
startingItem: MagazinePistolCaselessRifle
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolCaselessRifle
gun_chamber:
name: Chamber
startingItem: CartridgeCaselessRifle
priority: 1
whitelist:
tags:
- CartridgeCaselessRifle
Expand Down
8 changes: 8 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 @@ -25,12 +25,14 @@
startingItem: MagazineLightRifle
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineLightRifle
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifle
priority: 1
whitelist:
tags:
- CartridgeLightRifle
Expand Down Expand Up @@ -66,12 +68,14 @@
startingItem: MagazineLightRifle
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineLightRifle
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifle
priority: 1
whitelist:
tags:
- CartridgeLightRifle
Expand Down Expand Up @@ -107,12 +111,14 @@
startingItem: MagazineRifle
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifle
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
priority: 1
whitelist:
tags:
- CartridgeRifle
Expand Down Expand Up @@ -151,12 +157,14 @@
startingItem: MagazineRifle
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifle
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
priority: 1
whitelist:
tags:
- CartridgeRifle
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
startingItem: MagazinePistolSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
Expand Down Expand Up @@ -116,12 +118,14 @@
startingItem: MagazineMagnumSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnumSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgeMagnum
priority: 1
whitelist:
tags:
- CartridgeMagnum
Expand Down Expand Up @@ -168,12 +172,14 @@
startingItem: MagazinePistolSubMachineGunTopMounted
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistolSubMachineGunTopMounted
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
Expand All @@ -197,12 +203,14 @@
startingItem: MagazineMagnumSubMachineGunRubber
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnumSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgeMagnumRubber
priority: 1
whitelist:
tags:
- CartridgeMagnum
Expand Down
1 change: 1 addition & 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 @@ -63,6 +63,7 @@
gun_magazine:
name: Magazine
startingItem: MagazineShotgun
priority: 2
whitelist:
tags:
- MagazineShotgun
Expand Down