NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Changeling move when transforming (#43795)

Browse source 
* I love microbalance

* Update Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
ScarKy0 2026-04-28 20:24:15 +02:00 • committed by GitHub
parent 9e541fbcb3
commit 807ea69860
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Shared/Changeling/Components/ChangelingTransformComponent.cs
View file

@ -30,7 +30,7 @@ public sealed partial class ChangelingTransformComponent : Component
/// Time it takes to Transform
/// </summary>
[DataField, AutoNetworkedField]
public TimeSpan TransformWindup = TimeSpan.FromSeconds(5);
public TimeSpan TransformWindup = TimeSpan.FromSeconds(4f);
/// <summary>
/// The noise used when attempting to transform

8
Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs
View file

@ -156,8 +156,6 @@ public sealed partial class ChangelingTransformSystem : EntitySystem
ent,
target: targetIdentity)
{
BreakOnMove = true,
BreakOnWeightlessMove = true,
DuplicateCondition = DuplicateConditions.None,
RequireCanInteract = false,
DistanceThreshold = null,
@ -168,10 +166,14 @@ public sealed partial class ChangelingTransformSystem : EntitySystem
ref ChangelingTransformDoAfterEvent args)
{
args.Handled = true;
ent.Comp.CurrentTransformSound = _audio.Stop(ent.Comp.CurrentTransformSound);
if (args.Cancelled)
{
// Only stop the sound if we finish transforming successfully.
ent.Comp.CurrentTransformSound = _audio.Stop(ent.Comp.CurrentTransformSound);
return;
}
ent.Comp.CurrentTransformSound = null;
if (!_prototype.Resolve(ent.Comp.TransformCloningSettings, out var settings))
return;