From 3d15c80a23409378418e755703f3a838b160e606 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Mon, 8 Apr 2024 03:22:39 +0900 Subject: [PATCH] - tweak: No meaty ores during nukie war. (#276) --- Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs index d4e17797a2..ca59366269 100644 --- a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs +++ b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs @@ -12,6 +12,8 @@ using Content.Server.Popups; using Content.Server.Store.Components; using Content.Server.Store.Systems; using Content.Server._White.Sponsors; +using Content.Server.GameTicking; +using Content.Server.GameTicking.Rules.Components; using Content.Shared.FixedPoint; using Content.Shared.GameTicking; using Content.Shared.Humanoid; @@ -49,9 +51,9 @@ public sealed class MeatyOreStoreSystem : EntitySystem [Dependency] private readonly SponsorsManager _sponsorsManager = default!; [Dependency] private readonly PvsOverrideSystem _pvsOverrideSystem = default!; [Dependency] private readonly RoleSystem _roleSystem = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly SharedJobSystem _jobSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; private HttpClient _httpClient = default!; @@ -221,7 +223,11 @@ public sealed class MeatyOreStoreSystem : EntitySystem return; - var fake = _roleSystem.MindIsAntagonist(targetMind.Mind.Value) || !_jobSystem.CanBeAntag(mindComponent.Session); + var fake = _roleSystem.MindIsAntagonist(targetMind.Mind.Value) + || !_jobSystem.CanBeAntag(mindComponent.Session) + // If nukeops declared war + || _gameTicker.GetActiveGameRules().Any(x => + TryComp(x, out NukeopsRuleComponent? nukeops) && nukeops.WarDeclaredTime != null); var ckey = userActorComponent.PlayerSession.Name; var grant = user == target;