Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Identity fixes (#9701)

Browse Source
This commit is contained in:
Kara
2022-07-13 22:23:55 -07:00
committed by GitHub
parent 130a4cdd6a
commit a0c531d08b
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Clothing/MaskSystem.cs
View File

@@ -8,8 +8,10 @@ using Content.Server.Atmos.Components;
using Content.Server.Body.Components;
using Content.Server.Clothing.Components;
using Content.Server.Disease.Components;
using Content.Server.IdentityManagement;
using Content.Server.Nutrition.EntitySystems;
using Content.Server.Popups;
using Content.Shared.IdentityManagement.Components;
using Robust.Shared.Player;
namespace Content.Server.Clothing
@@ -19,6 +21,8 @@ namespace Content.Server.Clothing
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly ActionsSystem _actionSystem = default!;
[Dependency] private readonly IdentitySystem _identity = default!;
public override void Initialize()
{
base.Initialize();
@@ -45,6 +49,9 @@ namespace Content.Server.Clothing
mask.IsToggled ^= true;
_actionSystem.SetToggled(mask.ToggleAction, mask.IsToggled);
// Pulling mask down can change identity, so we want to update that
_identity.QueueIdentityUpdate(args.Performer);
if (mask.IsToggled)
_popupSystem.PopupEntity(Loc.GetString("action-mask-pull-down-popup-message", ("mask", mask.Owner)), args.Performer, Filter.Entities(args.Performer));
else
@@ -75,15 +82,19 @@ namespace Content.Server.Clothing
Dirty(item);
}
//toggle ingestion blocking
// toggle ingestion blocking
if (TryComp<IngestionBlockerComponent>(uid, out var blocker))
blocker.Enabled = !mask.IsToggled;
//toggle disease protection
// toggle disease protection
if (TryComp<DiseaseProtectionComponent>(uid, out var diseaseProtection))
diseaseProtection.IsActive = !mask.IsToggled;
//toggle breath tool connection (skip during equip since that is handled in LungSystem)
// toggle identity
if (TryComp<IdentityBlockerComponent>(uid, out var identity))
identity.Enabled = !mask.IsToggled;
// toggle breath tool connection (skip during equip since that is handled in LungSystem)
if (isEquip || !TryComp<BreathToolComponent>(uid, out var breathTool))
return;