Cluster grenades for uplink and security (#22029)
* clustergrenades go boom * Small tweaks * Some tweaks and soaplet * clustergrenadesystem changes and launcher types * small tweaks * typo * whitespace * rsi edit * another typo * add containers * Some changes related to merge * Forgot to change name * Made changes based on review * Removed new china lake ammo based on feedback in other PR * Unneeded nested loop moment * Nested loop needed after all moment
This commit is contained in:
@@ -7,6 +7,7 @@ using Content.Shared.Database;
|
||||
using Content.Shared.Projectiles;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.Physics.Events;
|
||||
using Content.Shared.Mobs.Components;
|
||||
using Robust.Shared.Player;
|
||||
|
||||
namespace Content.Server.Projectiles;
|
||||
@@ -70,7 +71,18 @@ public sealed class ProjectileSystem : SharedProjectileSystem
|
||||
|
||||
component.DamagedEntity = true;
|
||||
|
||||
if (component.DeleteOnCollide)
|
||||
if (component.DeleteOnCollide )
|
||||
{
|
||||
QueueDel(uid);
|
||||
}
|
||||
if (component.CanPenetrate)
|
||||
{
|
||||
component.DamagedEntity = false;
|
||||
|
||||
if (!TryComp<MobStateComponent>(target, out var mobState))
|
||||
QueueDel(uid);
|
||||
}
|
||||
else if (component.DeleteOnCollide && !component.CanPenetrate)
|
||||
{
|
||||
QueueDel(uid);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user