From 7fbf4be303e1c1f75cc2d268d811927dfdb4c021 Mon Sep 17 00:00:00 2001 From: Zekins <136648667+Zekins3366@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:15:44 +0300 Subject: [PATCH 1/4] Update PolymorphSystem.cs --- Content.Server/Polymorph/Systems/PolymorphSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index 8cae15d70df..e6ba1d02afd 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -199,7 +199,7 @@ private void OnDestruction(Entity ent, ref Destructi var targetTransformComp = Transform(uid); - var child = Spawn(configuration.Entity, targetTransformComp.Coordinates); + var child = Spawn(configuration.Entity, _transform.GetMapCoordinates(uid, targetTransformComp), rotation: _transform.GetWorldRotation(uid)); MakeSentientCommand.MakeSentient(child, EntityManager); From 89dd2d3b1dddf12b1f250288be6b5f0ad7a15af5 Mon Sep 17 00:00:00 2001 From: Zekins <136648667+Zekins3366@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:17:46 +0300 Subject: [PATCH 2/4] Update HumanoidAppearanceSystem.cs --- Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs index 505ad4f16c7..cec105bdae6 100644 --- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs +++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs @@ -44,6 +44,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan SetSex(target, sourceHumanoid.Sex, false, targetHumanoid); targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers); targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet); + SetTTSVoice(target, sourceHumanoid.Voice, targetHumanoid); // Corvax-TTS targetHumanoid.Gender = sourceHumanoid.Gender; if (TryComp(target, out var grammar)) From 51d21cbe216b9b6161e0588de97a2585af1652ab Mon Sep 17 00:00:00 2001 From: Zekins <136648667+Zekins3366@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:18:12 +0300 Subject: [PATCH 3/4] Update HumanoidAppearanceSystem.cs --- Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs index cec105bdae6..505ad4f16c7 100644 --- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs +++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs @@ -44,7 +44,6 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan SetSex(target, sourceHumanoid.Sex, false, targetHumanoid); targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers); targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet); - SetTTSVoice(target, sourceHumanoid.Voice, targetHumanoid); // Corvax-TTS targetHumanoid.Gender = sourceHumanoid.Gender; if (TryComp(target, out var grammar)) From 7f9191fc82616475a9cc8bae869d7ed91d3a3a44 Mon Sep 17 00:00:00 2001 From: Zekins <136648667+Zekins3366@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:28:20 +0300 Subject: [PATCH 4/4] Update PolymorphSystem.cs --- Content.Server/Polymorph/Systems/PolymorphSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index e6ba1d02afd..5eff7c170fc 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -199,7 +199,7 @@ private void OnDestruction(Entity ent, ref Destructi var targetTransformComp = Transform(uid); - var child = Spawn(configuration.Entity, _transform.GetMapCoordinates(uid, targetTransformComp), rotation: _transform.GetWorldRotation(uid)); + var child = Spawn(configuration.Entity, _transform.GetMapCoordinates(uid, targetTransformComp)); MakeSentientCommand.MakeSentient(child, EntityManager);