cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

Browse Source 
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
parent f5bbea9cc9 f4360e2da5
commit b348b617a3
362 changed files with 82084 additions and 106117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/core/component_printer.dm
+3 -3
View File
@@ -132,7 +132,7 @@
if (!materials.mat_container.has_materials(design.materials, efficiency_coeff))
return
materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]", user_data)
materials.use_materials(design.materials, efficiency_coeff, 1, "processed", "[design.name]", user_data)
return new design.build_path(drop_location())
/obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -160,7 +160,7 @@
balloon_alert_to_viewers("printed [design.name]")
materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]", user_data)
materials.use_materials(design.materials, efficiency_coeff, 1, "processed", "[design.name]", user_data)
var/atom/printed_design = new design.build_path(drop_location())
printed_design.pixel_x = printed_design.base_pixel_x + rand(-5, 5)
printed_design.pixel_y = printed_design.base_pixel_y + rand(-5, 5)
@@ -408,7 +408,7 @@
say("Not enough materials.")
return TRUE
materials.use_materials(design["materials"], efficiency_coeff, 1, design["name"], design["materials"], user_card)
materials.use_materials(design["materials"], efficiency_coeff, 1, "processed", design["name"], user_card)
print_module(design)
balloon_alert_to_viewers("printed [design["name"]]")
if ("remove_mat")