cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix telegnome action (#3325) 

* very slight cleanup

* fix telegnomes being trapped

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas 2025-03-26 22:02:34 +00:00 committed by GitHub
parent d18a74bc2e
commit 9ef886dfba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
View File

@ -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<MindSwappedComponent>(performer);
var targetMindPowerComp = EntityManager.GetComponent<MindSwappedComponent>(target);
var performerMindPowerComp = Comp<MindSwappedComponent>(performer);
var targetMindPowerComp = Comp<MindSwappedComponent>(target);
_actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity);
_actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity);

5
Content.Shared/Eye/VisibilityFlags.cs
View File

@ -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
}
}