From 850111f46996330744778c460d99ac3186d6fced Mon Sep 17 00:00:00 2001
From: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Date: Mon, 21 Apr 2025 19:20:26 +1000
Subject: [PATCH] Entity 0 fix (#1204)

* fix

* Update scattering_grenades.yml

* Update EntityTest.cs
---
 Content.IntegrationTests/Tests/EntityTest.cs              | 3 +++
 .../Objects/Weapons/Throwable/scattering_grenades.yml     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 78baca49e8..ebe2dcf5f5 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -41,6 +41,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
                     .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
+                    .Where(p => !p.Components.ContainsKey("CP14AreaEntityEffect")) // CP14 lightning detonates entities
                     .Select(p => p.ID)
                     .ToList();
 
@@ -105,6 +106,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
                     .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
+                    .Where(p => !p.Components.ContainsKey("CP14AreaEntityEffect")) // CP14 lightning detonates entities
                     .Select(p => p.ID)
                     .ToList();
                 foreach (var protoId in protoIds)
@@ -347,6 +349,7 @@ namespace Content.IntegrationTests.Tests
                 "GridFill",
                 "RoomFill",
                 "CP14BiomeSpawner", // CP14 this component delete all entities on this tile
+                "CP14AreaEntityEffect", // CP14 lightning detonates entities
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "Broadphase",
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index b81cd445f0..302017b88e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -157,10 +157,10 @@
       map: ["Base"]
     - state: primed
       map: ["enum.TriggerVisualLayers.Base"]
-  #- type: ScatteringGrenade #CP14 disabled (type !ent0 in discord)
-  #  fillPrototype: BulletFoam
-  #  capacity: 30
-  #  velocity: 30
+  - type: ScatteringGrenade 
+    fillPrototype: BulletFoam
+    capacity: 30
+    velocity: 30
   - type: OnUseTimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"