cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-01 00:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

CS fixes in YML issues everywhere

Browse Source
This commit is contained in:
SirSmith148
2025-10-01 01:43:35 -07:00
parent a7733e1a37
commit ccdb1b161d
10 changed files with 346 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/EntityEffects/EntityEffectSystem.cs
+23 -7
View File
@@ -5,9 +5,9 @@ using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Server.Botany;
using Content.Server.Botany.Components;
using Content.Server.Botany.Systems;
using Content.Server.Botany;
using Content.Server.Chat.Systems;
using Content.Server.Emp;
using Content.Server.Explosion.EntitySystems;
@@ -28,17 +28,19 @@ using Content.Server.Zombies;
using Content.Shared.Atmos;
using Content.Shared.Audio;
using Content.Shared.Coordinates.Helpers;
using Content.Shared.EntityEffects;
using Content.Shared.EntityEffects.EffectConditions;
using Content.Shared.EntityEffects.Effects;
using Content.Shared.EntityEffects.Effects.PlantMetabolism;
using Content.Shared.EntityEffects.Effects.StatusEffects;
using Content.Shared.EntityEffects.Effects;
using Content.Shared.EntityEffects;
using Content.Shared.Humanoid;
using Content.Shared.Maps;
using Content.Shared.Mind.Components;
using Content.Shared.Nyanotrasen.Chemistry.Effects;
using Content.Shared.Popups;
using Content.Shared.Random;
using Content.Shared.Xenoarchaeology.Artifact;
using Content.Shared.Xenoarchaeology.Artifact.Components;
using Content.Shared.Zombies;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -47,9 +49,8 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using TemperatureCondition = Content.Shared.EntityEffects.EffectConditions.Temperature; // disambiguate the namespace
using PolymorphEffect = Content.Shared.EntityEffects.Effects.Polymorph;
using TemperatureCondition = Content.Shared.EntityEffects.EffectConditions.Temperature; // disambiguate the namespace
namespace Content.Server.EntityEffects;
@@ -999,8 +1000,23 @@ public sealed class EntityEffectSystem : EntitySystem
private void OnActivateArtifact(ref ExecuteEntityEffectEvent<ActivateArtifact> args)
{
var artifact = args.Args.EntityManager.EntitySysManager.GetEntitySystem<ArtifactSystem>();
artifact.TryActivateArtifact(args.Args.TargetEntity, logMissing: false);
// Get the XenoArtifact system
var xenoArtifactSystem = EntityManager.EntitySysManager.GetEntitySystem<SharedXenoArtifactSystem>();
// Make sure the target entity has a XenoArtifactComponent
if (!TryComp<XenoArtifactComponent>(args.Args.TargetEntity, out var artifactComp))
return;
// Wrap the entity and component in the Entity<> type
var artifactEntity = new Entity<XenoArtifactComponent>(args.Args.TargetEntity, artifactComp);
// Try to activate the artifact
xenoArtifactSystem.TryActivateXenoArtifact(
artifact: artifactEntity,
user: null, // no performer info in the effect
target: args.Args.TargetEntity,
coordinates: Transform(args.Args.TargetEntity).Coordinates
);
}
// Nyanotrasen