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

Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

Browse Source
This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
parent 4f87df6b81 8f10b2af19
commit de4c3b255d
1007 changed files with 40287 additions and 33507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+7 -6
View File
@@ -478,12 +478,13 @@
if(isstack(created))
var/obj/item/stack/crafted_stack = created
if(recipe.res_amount > 0 && recipe.req_amount != recipe.res_amount)
var/scale = recipe.req_amount / recipe.res_amount
for(var/mat in result_mats)
result_mats[mat] *= scale
crafted_stack.mats_per_unit = SSmaterials.get_material_set_cache(result_mats)
crafted_stack.update_custom_materials()
if(crafted_stack.amount) // If our stack's been emptied, it means another stack's already eaten it, and that stack'll deal with materials
if(recipe.res_amount > 0 && recipe.req_amount != recipe.res_amount)
var/scale = recipe.req_amount / recipe.res_amount
for(var/mat in result_mats)
result_mats[mat] *= scale
crafted_stack.mats_per_unit = SSmaterials.get_material_set_cache(result_mats)
crafted_stack.update_custom_materials()
else
created.set_custom_materials(result_mats, recipe.req_amount * multiplier)