tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mind ecs (#14412)

Browse Source
This commit is contained in:
ShadowCommander
2023-03-26 11:31:13 -07:00
committed by GitHub
parent 0e5dc41fe8
commit bfc4da9377
85 changed files with 1150 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/PDA/PDASystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Instruments;
using Content.Server.Light.Components;
using Content.Server.Light.EntitySystems;
using Content.Server.Light.Events;
using Content.Server.Mind;
using Content.Server.PDA.Ringer;
using Content.Server.Store.Components;
using Content.Server.Store.Systems;
@@ -27,6 +28,7 @@ namespace Content.Server.PDA
[Dependency] private readonly StationSystem _stationSystem = default!;
[Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
[Dependency] private readonly StoreSystem _storeSystem = default!;
[Dependency] private readonly MindSystem _mindSystem = default!;
public override void Initialize()
{
@@ -124,8 +126,10 @@ namespace Content.Server.PDA
if (session.AttachedEntity is not { Valid: true } user)
continue;
if (storeComponent.AccountOwner == user || (TryComp<MindComponent>(session.AttachedEntity, out var mindcomp) && mindcomp.Mind != null &&
mindcomp.Mind.HasRole<TraitorRole>()))
if (storeComponent.AccountOwner == user
|| (TryComp<MindContainerComponent>(session.AttachedEntity, out var mindComp)
&& mindComp.Mind != null
&& _mindSystem.HasRole<TraitorRole>(mindComp.Mind)))
_cartridgeLoaderSystem?.UpdateUiState(pda.Owner, uplinkState, session);
}
}
@@ -181,9 +185,10 @@ namespace Content.Server.PDA
if (!TryComp<StoreComponent>(pda.Owner, out var storeComp))
return;
if (storeComp.AccountOwner != args.User &&
!(TryComp<MindComponent>(args.User, out var mindcomp) && mindcomp.Mind != null && mindcomp.Mind.HasRole<TraitorRole>()))
return;
if (storeComp.AccountOwner != args.User
&& !(TryComp<MindContainerComponent>(args.User, out var mindComp)
&& mindComp.Mind != null
&& _mindSystem.HasRole<TraitorRole>(mindComp.Mind))) return;
if (!_uiSystem.TryGetUi(pda.Owner, PDAUiKey.Key, out var ui))
return;