Fix PA particles (#23719)

diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 1d256071d622828d1e9d18380ccfbad8996b9a54..8c6b84ec047343d24c05287d82b0f8a0d6b6d8ad 100644 (file)
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -71,18 +71,14 @@ public sealed class ProjectileSystem : SharedProjectileSystem
 
         component.DamagedEntity = true;
 
-        if (component.DeleteOnCollide )
-        {
-            QueueDel(uid);
-        }
         if (component.CanPenetrate)
         {
             component.DamagedEntity = false;
 
-            if (!TryComp<MobStateComponent>(target, out var mobState))
+            if (component.DeleteOnCollide && !HasComp<MobStateComponent>(target))
                 QueueDel(uid);
         }
-        else if (component.DeleteOnCollide && !component.CanPenetrate)
+        else if (component.DeleteOnCollide)
         {
             QueueDel(uid);
         }

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index bf9579d65bdd970aadce7fad224da10d903f496b..46a29d20bdad50adc7a0e1002136df162e986d7d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -359,7 +359,7 @@
       walkModifier: 0.6
       sprintModifier: 0.6
     - type: HeldSpeedModifier
-    - type: Sprite 
+    - type: Sprite
       sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi
       layers:
         - state: base

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
index 951c9ec5c997d36fc1f6dd32efeb6ad5392815c6..101ebc94bd03be656acf3ca95bd6d25cc95193a3 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -13,15 +13,17 @@
         map: [ "unshaded" ]
     - type: Projectile
       deleteOnCollide: false
+      canPenetrate: true
+      impactEffect: null
       soundHit:
         path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
       damage:
         types:
-          Radiation: 10
+          Radiation: 25
     - type: Physics
     - type: Fixtures
       fixtures:
-        fix1:
+        projectile:
           shape:
             !type:PhysShapeAabb
             bounds: "-0.48,-0.48,0.48,0.48"