From af72f2e17cdf4392f5d3c214ec865ffa434f8c18 Mon Sep 17 00:00:00 2001 From: Jezithyr Date: Sat, 12 Oct 2024 22:21:44 -0700 Subject: [PATCH] Applying Fix from #32764 to staging --- Content.Server/Thief/Systems/ThiefBeaconSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs index 80471b6427..4c65ba5c44 100644 --- a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs +++ b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Examine; using Content.Shared.Foldable; using Content.Shared.Popups; using Content.Shared.Verbs; +using Content.Shared.Roles; using Robust.Shared.Audio.Systems; namespace Content.Server.Thief.Systems; @@ -18,7 +19,7 @@ public sealed class ThiefBeaconSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly MindSystem _mind = default!; - + [Dependency] private readonly SharedRoleSystem _roles = default!; public override void Initialize() { base.Initialize(); @@ -37,7 +38,7 @@ public sealed class ThiefBeaconSystem : EntitySystem return; var mind = _mind.GetMind(args.User); - if (!HasComp(mind)) + if (mind == null || !_roles.MindHasRole(mind.Value)) return; var user = args.User; -- 2.52.0