Fix tranq shells not injecting solution (#11254)
This commit is contained in:
@@ -103,6 +103,12 @@ public sealed partial class GunSystem : SharedGunSystem
|
|||||||
shotProjectiles.Add(uid);
|
shotProjectiles.Add(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//signal ChemicalAmmo to transfer solution
|
||||||
|
RaiseLocalEvent(cartridge.Owner, new AmmoShotEvent()
|
||||||
|
{
|
||||||
|
FiredProjectiles = shotProjectiles,
|
||||||
|
}, false);
|
||||||
|
|
||||||
SetCartridgeSpent(cartridge, true);
|
SetCartridgeSpent(cartridge, true);
|
||||||
MuzzleFlash(gun.Owner, cartridge, user);
|
MuzzleFlash(gun.Owner, cartridge, user);
|
||||||
PlaySound(gun.Owner, gun.SoundGunshot?.GetSound(Random, ProtoManager), user);
|
PlaySound(gun.Owner, gun.SoundGunshot?.GetSound(Random, ProtoManager), user);
|
||||||
|
|||||||
@@ -131,5 +131,7 @@
|
|||||||
solution: ammo
|
solution: ammo
|
||||||
- type: SolutionTransfer
|
- type: SolutionTransfer
|
||||||
maxTransferAmount: 15
|
maxTransferAmount: 15
|
||||||
|
- type: ExaminableSolution
|
||||||
|
solution: ammo
|
||||||
- type: SpentAmmoVisuals
|
- type: SpentAmmoVisuals
|
||||||
state: "practice"
|
state: "practice"
|
||||||
|
|||||||
@@ -100,6 +100,7 @@
|
|||||||
solution: ammo
|
solution: ammo
|
||||||
- type: SolutionInjectOnCollide
|
- type: SolutionInjectOnCollide
|
||||||
transferAmount: 15
|
transferAmount: 15
|
||||||
|
blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
|
||||||
- type: InjectableSolution
|
- type: InjectableSolution
|
||||||
solution: ammo
|
solution: ammo
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user