cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
parent ee99d0e5b0 392f1d93e8
commit 939f2fc9ac
277 changed files with 8854 additions and 7401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/core/component_printer.dm
+3 -3
View File
@@ -390,7 +390,7 @@
. = ..()
if (.)
return
var/obj/item/card/id/advanced/user_card = astype(usr, /mob/living)?.get_idcard()
var/alist/user_data = ID_DATA(usr)
switch (action)
if ("print")
@@ -401,14 +401,14 @@
var/list/design = scanned_designs[design_id]
if (!materials.can_use_resource(user_card))
if (!materials.can_use_resource(user_data = user_data))
return TRUE
if (!materials.mat_container.has_materials(design["materials"], efficiency_coeff))
say("Not enough materials.")
return TRUE
materials.use_materials(design["materials"], efficiency_coeff, 1, "processed", design["name"], user_card)
materials.use_materials(design["materials"], efficiency_coeff, 1, design["name"], design["materials"], user_data = user_data)
print_module(design)
balloon_alert_to_viewers("printed [design["name"]]")
if ("remove_mat")