From 9ef886dfba54e67ea8fcd50a986ed2decdcff762 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 26 Mar 2025 22:02:34 +0000 Subject: [PATCH] fix telegnome action (#3325) * very slight cleanup * fix telegnomes being trapped --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Psionics/Abilities/MindSwapPowerSystem.cs | 10 ++++------ Content.Shared/Eye/VisibilityFlags.cs | 5 +++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index b6da0140cc..bf18290810 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -177,18 +177,16 @@ namespace Content.Server.Abilities.Psionics //To unnatch the minds, do it like this. //Have to unnattach the minds before we reattach them via transfer. Still feels weird, but seems to work well. _mindSystem.TransferTo(performerMindId, null); - _mindSystem.TransferTo(targetMindId, null); // Do the transfer. + if (targetMind != null) + _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind); if (performerMind != null) _mindSystem.TransferTo(performerMindId, target, ghostCheckOverride: true, false, performerMind); - if (targetMind != null) - _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind); - if (end) { - var performerMindPowerComp = EntityManager.GetComponent(performer); - var targetMindPowerComp = EntityManager.GetComponent(target); + var performerMindPowerComp = Comp(performer); + var targetMindPowerComp = Comp(target); _actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity); _actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity); diff --git a/Content.Shared/Eye/VisibilityFlags.cs b/Content.Shared/Eye/VisibilityFlags.cs index e375d5920f..c8a3389e49 100644 --- a/Content.Shared/Eye/VisibilityFlags.cs +++ b/Content.Shared/Eye/VisibilityFlags.cs @@ -9,9 +9,10 @@ namespace Content.Shared.Eye None = 0, Normal = 1 << 0, Ghost = 1 << 1, - Subfloor = 1 << 2, + Subfloor = 1 << 3, // DeltaV - 4 is occupied by PsionicInvisibility and changing that massively fucks up stuff // Begin DeltaV Additions - PsionicInvisibility = 1 << 3, + PsionicInvisibility = 1 << 2, TelegnosticProjection = PsionicInvisibility | Normal + // End DeltaV Additions } }