Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Psionic insulation and invisibility fix #887

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Psionic insulation and invisibility fix #887

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c1102
fix
Guess-My-Name Feb 22, 2024
b3b4f91
invis people can no longer see other invis people
Guess-My-Name Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ private void OnInvisInit(EntityUid uid, PsionicallyInvisibleComponent component,
_visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
_visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(uid, visibility);

SetCanSeePsionicInvisiblity(uid, true);
}


Expand All @@ -99,8 +97,6 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon
_visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(uid, visibility);
}
if (HasComp<PotentialPsionicComponent>(uid) && !HasComp<PsionicInsulationComponent>(uid))
SetCanSeePsionicInvisiblity(uid, false);
}

private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
Expand Down Expand Up @@ -129,7 +125,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set)
{
if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
{
//_eye.SetVisibilityMask(uid, eye.VisibilityMask & (int) VisibilityFlags.PsionicInvisibility, eye);
_eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye);
}
}
}
Expand Down
Loading