cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 11:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

Browse Source
This commit is contained in:
Majkl-J
2025-02-20 00:00:19 -08:00
parent 719fa8a30e 5414cc325c
commit b6b8306fda
7388 changed files with 94693 additions and 418558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/budgetordering.dm
+6 -1
View File
@@ -94,13 +94,18 @@
)
if((P.hidden && (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.drop_pod_only))
continue
var/obj/item/first_item = length(P.contains) > 0 ? P.contains[1] : null
data["supplies"][P.group]["packs"] += list(list(
"name" = P.name,
"cost" = P.get_cost(),
"id" = pack,
"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
"first_item_icon" = first_item?.icon,
"first_item_icon_state" = first_item?.icon_state,
"goody" = P.goody,
"access" = P.access
"access" = P.access,
"contains" = P.get_contents_ui_data(),
))
//Data regarding the User's capability to buy things.