From 58d8f3e718bd8f9010f07a3d29dd36f21e277509 Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:51:30 +0300 Subject: [PATCH] fix(uplink): Show all items in debug uplink --- Content.Server/Store/Systems/StoreSystem.Listings.cs | 4 +++- Resources/Prototypes/Entities/Objects/Specific/syndicate.yml | 3 +++ Resources/Prototypes/tags.yml | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs index f24924b46c..acd1838ee5 100644 --- a/Content.Server/Store/Systems/StoreSystem.Listings.cs +++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs @@ -2,6 +2,7 @@ using System.Linq; using Content.Server.Store.Components; using Content.Shared.FixedPoint; using Content.Shared.Store; +using Content.Shared.Tag; using Robust.Shared.Random; namespace Content.Server.Store.Systems; @@ -10,6 +11,7 @@ public sealed partial class StoreSystem { // WD START [Dependency] private readonly IRobustRandom _random = default!; // WD + [Dependency] private readonly TagSystem _tag = default!; // Amour private void ApplySales(IEnumerable listings, StorePresetPrototype store) { @@ -129,7 +131,7 @@ public sealed partial class StoreSystem if (!ListingHasCategory(listing, categories)) continue; - if (listing.Conditions != null) + if (listing.Conditions != null && !( storeEntity != null && _tag.HasTag(storeEntity.Value, "DebugUplink"))) { var args = new ListingConditionArgs(buyer, storeEntity, listing, EntityManager); var conditionsMet = true; diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index f2c236064a..0dddbfe189 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -132,3 +132,6 @@ preset: StorePresetUplink balance: Telecrystal: 99999 + - type: Tag + tags: + - DebugUplink diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 008a90eb04..e259c1e420 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -927,6 +927,9 @@ - type: Tag id: NukeOpsUplink +- type: Tag + id: DebugUplink + - type: Tag id: Ointment @@ -1184,7 +1187,7 @@ - type: Tag id: SuitEVA - + - type: Tag id: Sunglasses