From bd01f0f2b60d5e76ddc8a1ff5968b56f2c8a0063 Mon Sep 17 00:00:00 2001 From: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Date: Mon, 23 Mar 2026 18:16:45 -0400 Subject: [PATCH] [NO GBP] Corrects two issues with goodies and the ordering console. (#95478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Whoops. ~~I missed some nuance when I made #94483, namely that while I didn't want players requesting CRATES like guns, grenades, spare SM shards with their department budgets, the logic also touches goodies and private orders meaning that players were unable to place goodie orders for things that they may not have explicit access to do so, which is part of the reason why you'd be ordering them privately in the first place. It's cargo responsibility to determine if the player should/not be receiving that item.~~ I have meditated on the issue, and I realize, nah, this is probably both a healthier design decision as well as the reason we have things like the black market in the first place. The core of the PR below however is however sound. ALSO, I made a fairly confusing mistake with the TGUI where the goodies category just... hasn't been visible! That's on me. ## Why It's Good For The Game Makes cargo goodies viewable. Makes cargo goodies purchasable. Fixes #94928 🐛 💥 ‼️ ## Changelog :cl: fix: Cargo goodies are now visible in the ordering and request consoles. /:cl: --- code/modules/cargo/orderconsole.dm | 1 + tgui/packages/tgui/interfaces/Cargo/CargoCatalog.tsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 40edffda8e4..7101f38f0f3 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -297,6 +297,7 @@ if(pack.access_view && !(pack.access_view in access) && personal_department) // We want to block cargo requests when a player is requesting a restricted pack that they don't have access to. // BUT only when it's requested with non-cargo funds, as cargo had direct oversight over their own purchases with their own budget. + // HOWEVER, this shouldn't prevent someone from buying something using their own personal funds. say("ERROR: User lacks the requisite access for this purchase request.") return diff --git a/tgui/packages/tgui/interfaces/Cargo/CargoCatalog.tsx b/tgui/packages/tgui/interfaces/Cargo/CargoCatalog.tsx index 2d97b55d8aa..a83315c8cd6 100644 --- a/tgui/packages/tgui/interfaces/Cargo/CargoCatalog.tsx +++ b/tgui/packages/tgui/interfaces/Cargo/CargoCatalog.tsx @@ -147,7 +147,6 @@ function CatalogTabs(props: CatalogTabsProps & Props) { setActiveSupplyName(supply.name); setSearchText(''); }} - style={supply.name === "Goodies" ? {display: 'none'} : undefined} > {supply.name}