From aea68b942ab8373f0f18b99ee702a4ebb087215d Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 8 Jan 2024 01:22:46 -0500
Subject: [PATCH] Fix PA particles (#23719)

---
 Content.Server/Projectiles/ProjectileSystem.cs            | 8 ++------
 .../Objects/Weapons/Guns/Battery/battery_guns.yml         | 2 +-
 .../Entities/Structures/Power/Generation/PA/particles.yml | 6 ++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 1d256071d6..8c6b84ec04 100644
--- 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 bf9579d65b..46a29d20bd 100644
--- 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 951c9ec5c9..101ebc94bd 100644
--- 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"