Skip to content

Commit 467e983

Browse files
AexxieDrSmugleafmetalgearsloth
authored
Move grenade components to shared (space-wizards#22691)
* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Delete .run/Content Server+Client.run.xml HOW DID THIS GET IN HERE ITS NOT AHHHH * Update Content.Client/Explosion/SmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> * Update ExplodeOnTriggerComponent.cs * Revert "Delete .run/Content Server+Client.run.xml" This reverts commit 29ee05f. * Fix? * cannot figure out how to get this to go back please forgive * Fixes a network issue * leftovers * Fixes --------- Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
1 parent 4520ac8 commit 467e983

40 files changed

+125
-86
lines changed

‎.run/Content Server+Client.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<component name="ProjectRunConfigurationManager">
1+
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Content Server+Client" type="CompoundRunConfigurationType">
33
<toRun name="Content.Client" type="DotNetProject" />
44
<toRun name="Content.Server" type="DotNetProject" />

‎Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Content.Shared.Explosion;
2+
using Content.Shared.Explosion.Components;
23
using Robust.Client.GameObjects;
34

45
namespace Content.Client.Explosion;

‎Content.Client/Explosion/ExplosionOverlay.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Numerics;
2-
using Content.Shared.Explosion;
2+
using Content.Shared.Explosion.Components;
33
using JetBrains.Annotations;
44
using Robust.Client.Graphics;
55
using Robust.Shared.Enums;

‎Content.Client/Explosion/ExplosionOverlaySystem.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Content.Shared.Explosion;
2+
using Content.Shared.Explosion.Components;
23
using Robust.Client.Graphics;
34
using Robust.Client.ResourceManagement;
45
using Robust.Shared.GameStates;

‎Content.Client/Explosion/SmokeOnTriggerSystem.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using Content.Shared.Explosion.EntitySystems;
2+
3+
namespace Content.Client.Explosion;
4+
5+
public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
6+
{
7+
}

‎Content.Client/Explosion/TriggerOnProximityComponent.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Content.Shared.Explosion;
2+
using Content.Shared.Explosion.Components;
23

34
namespace Content.Client.Explosion;
45

‎Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Content.IntegrationTests.Tests.Interaction;
22
using Content.Server.Explosion.Components;
3+
using Content.Shared.Explosion.Components;
34
using Robust.Shared.Containers;
45
using Robust.Shared.GameObjects;
56

‎Content.Server/Defusable/Systems/DefusableSystem.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
using Content.Shared.Database;
99
using Content.Shared.Defusable;
1010
using Content.Shared.Examine;
11+
using Content.Shared.Explosion.Components;
12+
using Content.Shared.Explosion.Components.OnTrigger;
1113
using Content.Shared.Popups;
1214
using Content.Shared.Verbs;
1315
using Content.Shared.Wires;

‎Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Content.Server/Explosion/Components/TriggerOnProximityComponent.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Content.Server.Explosion.EntitySystems;
22
using Content.Shared.Explosion;
3+
using Content.Shared.Explosion.Components;
34
using Content.Shared.Physics;
45
using Robust.Shared.Physics.Collision.Shapes;
56
using Robust.Shared.Physics.Components;

0 commit comments

Comments
 (0)