diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs index 9682fdfd77..3b90ca2a0f 100644 --- a/Content.Server/Weapon/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs @@ -103,6 +103,12 @@ public sealed partial class GunSystem : SharedGunSystem shotProjectiles.Add(uid); } + //signal ChemicalAmmo to transfer solution + RaiseLocalEvent(cartridge.Owner, new AmmoShotEvent() + { + FiredProjectiles = shotProjectiles, + }, false); + SetCartridgeSpent(cartridge, true); MuzzleFlash(gun.Owner, cartridge, user); PlaySound(gun.Owner, gun.SoundGunshot?.GetSound(Random, ProtoManager), user); diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 2b158fe4fe..968c505d27 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -131,5 +131,7 @@ solution: ammo - type: SolutionTransfer maxTransferAmount: 15 + - type: ExaminableSolution + solution: ammo - type: SpentAmmoVisuals state: "practice" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 4e6d0e846f..89b80b39f1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -100,6 +100,7 @@ solution: ammo - type: SolutionInjectOnCollide transferAmount: 15 + blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask - type: InjectableSolution solution: ammo