juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup changeling namespaces and prototypes (#39794)

Browse Source
This commit is contained in:
slarticodefast
2025-08-21 02:42:42 +02:00
committed by GitHub
parent e5011cb305
commit d286a70d47
15 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs → Content.Shared/Changeling/ChangelingDevourEvents.cs
View File

@@ -2,7 +2,7 @@
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;
namespace Content.Shared.Changeling.Devour;
namespace Content.Shared.Changeling;
/// <summary>
/// Action event for Devour, someone has initiated a devour on someone, begin to windup.

2
Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs → Content.Shared/Changeling/ChangelingTransformEvents.cs
View File

@@ -2,7 +2,7 @@
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;
namespace Content.Shared.Changeling.Transform;
namespace Content.Shared.Changeling;
/// <summary>
/// Action event for opening the changeling transformation radial menu.

3
Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs → Content.Shared/Changeling/Components/ChangelingDevourComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Changeling.Systems;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
@@ -7,7 +8,7 @@ using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
namespace Content.Shared.Changeling.Devour;
namespace Content.Shared.Changeling.Components;
/// <summary>
/// Component responsible for Changelings Devour attack. Including the amount of damage

3
Content.Shared/Changeling/ChangelingIdentityComponent.cs → Content.Shared/Changeling/Components/ChangelingIdentityComponent.cs
View File

@@ -2,7 +2,7 @@ using Content.Shared.Cloning;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
namespace Content.Shared.Changeling;
namespace Content.Shared.Changeling.Components;
/// <summary>
/// The storage component for Changelings, it handles the link between a changeling and its consumed identities
@@ -29,6 +29,7 @@ public sealed partial class ChangelingIdentityComponent : Component
/// The cloning settings passed to the CloningSystem, contains a list of all components to copy or have handled by their
/// respective systems.
/// </summary>
[DataField]
public ProtoId<CloningSettingsPrototype> IdentityCloningSettings = "ChangelingCloningSettings";
public override bool SendOnlyToOwner => true;

2
Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs → Content.Shared/Changeling/Components/ChangelingStoredIdentityComponent.cs
View File

@@ -1,7 +1,7 @@
using Robust.Shared.GameStates;
using Robust.Shared.Player;
namespace Content.Shared.Changeling;
namespace Content.Shared.Changeling.Components;
/// <summary>
/// Marker component for cloned identities devoured by a changeling.

3
Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs → Content.Shared/Changeling/Components/ChangelingTransformComponent.cs
View File

@@ -1,9 +1,10 @@
using Content.Shared.Changeling.Systems;
using Content.Shared.Cloning;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
namespace Content.Shared.Changeling.Transform;
namespace Content.Shared.Changeling.Components;
/// <summary>
/// The component containing information about Changelings Transformation action

3
Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs → Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Administration.Logs;
using Content.Shared.Armor;
using Content.Shared.Atmos.Rotting;
using Content.Shared.Body.Components;
using Content.Shared.Changeling.Components;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.DoAfter;
@@ -19,7 +20,7 @@ using Robust.Shared.Network;
using Robust.Shared.Random;
using Robust.Shared.Timing;
namespace Content.Shared.Changeling.Devour;
namespace Content.Shared.Changeling.Systems;
public sealed class ChangelingDevourSystem : EntitySystem
{

3
Content.Shared/Changeling/ChangelingIdentitySystem.cs → Content.Shared/Changeling/Systems/ChangelingIdentitySystem.cs
View File

@@ -1,4 +1,5 @@
using System.Numerics;
using Content.Shared.Changeling.Components;
using Content.Shared.Cloning;
using Content.Shared.Humanoid;
using Content.Shared.Mind.Components;
@@ -9,7 +10,7 @@ using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Shared.Changeling;
namespace Content.Shared.Changeling.Systems;
public sealed class ChangelingIdentitySystem : EntitySystem
{

2
Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs → Content.Shared/Changeling/Systems/ChangelingTransformSystem.UI.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Changeling.Transform;
namespace Content.Shared.Changeling.Systems;
/// <summary>
/// Send when a player selects an intentity to transform into in the radial menu.

9
Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs → Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Actions;
using Content.Shared.Administration.Logs;
using Content.Shared.Changeling.Components;
using Content.Shared.Cloning;
using Content.Shared.Database;
using Content.Shared.DoAfter;
@@ -10,7 +11,7 @@ using Robust.Shared.Audio.Systems;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
namespace Content.Shared.Changeling.Transform;
namespace Content.Shared.Changeling.Systems;
public sealed partial class ChangelingTransformSystem : EntitySystem
{
@@ -102,7 +103,7 @@ public sealed partial class ChangelingTransformSystem : EntitySystem
if (_net.IsServer)
ent.Comp.CurrentTransformSound = _audio.PlayPvs(ent.Comp.TransformAttemptNoise, ent)?.Entity;
if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
if (TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player}) ");
else
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\"");
@@ -162,8 +163,8 @@ public sealed partial class ChangelingTransformSystem : EntitySystem
_humanoidAppearanceSystem.CloneAppearance(targetIdentity, args.User);
_cloningSystem.CloneComponents(targetIdentity, args.User, settings);
if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
if (TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
_adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player})");
else
_adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\"");