Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cluster grenade refactor and contra markings #31108

Merged
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 0 additions & 117 deletions Content.Server/Explosion/Components/ClusterGrenadeComponent.cs

This file was deleted.

48 changes: 48 additions & 0 deletions Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using Content.Server.Explosion.EntitySystems;
using Robust.Shared.Containers;
using Robust.Shared.Prototypes;

namespace Content.Server.Explosion.Components;
/// <summary>
/// Grenades that, when triggered, explode into projectiles
/// </summary>
[RegisterComponent, Access(typeof(ProjectileGrenadeSystem))]
public sealed partial class ProjectileGrenadeComponent : Component
{
public Container Container = default!;

/// <summary>
/// The kind of projectile that the prototype is filled with.
/// </summary>
[DataField]
public EntProtoId? FillPrototype;

/// <summary>
/// If we have a pre-fill how many more can we spawn.
/// </summary>
public int UnspawnedCount;

/// <summary>
/// Total amount of projectiles
/// </summary>
[DataField]
public int Capacity = 3;

/// <summary>
/// Should the angle of the projectiles be uneven?
/// </summary>
[DataField]
public bool RandomAngle = false;

/// <summary>
/// The minimum speed the projectiles may come out at
/// </summary>
[DataField]
public float MinVelocity = 2f;

/// <summary>
/// The maximum speed the projectiles may come out at
/// </summary>
[DataField]
public float MaxVelocity = 6f;
}
177 changes: 0 additions & 177 deletions Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs

This file was deleted.

Loading
Loading