diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 8af13cb566..7885dabe27 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fa4d23b055..66e63fd55c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -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 @@ -65,6 +67,7 @@ startingItem: MagazinePistol insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 whitelist: tags: - MagazinePistol @@ -72,6 +75,7 @@ gun_chamber: name: Chamber startingItem: CartridgePistol + priority: 1 whitelist: tags: - CartridgePistol @@ -124,12 +128,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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e36cca86e1..510e532bd9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 17bf1371ba..2ad36f7f6c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index a210f7c847..a59d2bb917 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -63,6 +63,7 @@ gun_magazine: name: Magazine startingItem: MagazineShotgun + priority: 2 whitelist: tags: - MagazineShotgun