Fix PA particles (#23719)
This commit is contained in:
@@ -71,18 +71,14 @@ public sealed class ProjectileSystem : SharedProjectileSystem
|
|||||||
|
|
||||||
component.DamagedEntity = true;
|
component.DamagedEntity = true;
|
||||||
|
|
||||||
if (component.DeleteOnCollide )
|
|
||||||
{
|
|
||||||
QueueDel(uid);
|
|
||||||
}
|
|
||||||
if (component.CanPenetrate)
|
if (component.CanPenetrate)
|
||||||
{
|
{
|
||||||
component.DamagedEntity = false;
|
component.DamagedEntity = false;
|
||||||
|
|
||||||
if (!TryComp<MobStateComponent>(target, out var mobState))
|
if (component.DeleteOnCollide && !HasComp<MobStateComponent>(target))
|
||||||
QueueDel(uid);
|
QueueDel(uid);
|
||||||
}
|
}
|
||||||
else if (component.DeleteOnCollide && !component.CanPenetrate)
|
else if (component.DeleteOnCollide)
|
||||||
{
|
{
|
||||||
QueueDel(uid);
|
QueueDel(uid);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -359,7 +359,7 @@
|
|||||||
walkModifier: 0.6
|
walkModifier: 0.6
|
||||||
sprintModifier: 0.6
|
sprintModifier: 0.6
|
||||||
- type: HeldSpeedModifier
|
- type: HeldSpeedModifier
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi
|
sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi
|
||||||
layers:
|
layers:
|
||||||
- state: base
|
- state: base
|
||||||
|
|||||||
@@ -13,15 +13,17 @@
|
|||||||
map: [ "unshaded" ]
|
map: [ "unshaded" ]
|
||||||
- type: Projectile
|
- type: Projectile
|
||||||
deleteOnCollide: false
|
deleteOnCollide: false
|
||||||
|
canPenetrate: true
|
||||||
|
impactEffect: null
|
||||||
soundHit:
|
soundHit:
|
||||||
path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
|
path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Radiation: 10
|
Radiation: 25
|
||||||
- type: Physics
|
- type: Physics
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
fixtures:
|
fixtures:
|
||||||
fix1:
|
projectile:
|
||||||
shape:
|
shape:
|
||||||
!type:PhysShapeAabb
|
!type:PhysShapeAabb
|
||||||
bounds: "-0.48,-0.48,0.48,0.48"
|
bounds: "-0.48,-0.48,0.48,0.48"
|
||||||
|
|||||||
Reference in New Issue
Block a user