mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 00:58:26 +01:00
[NO GBP] Silo logging hotfix 2 (includes hotfix 1): Multitool linking, decon/recon, funky define fix (#92349)
## About The Pull Request Includes #92346 Additionally, fixes a non-pattern define that would fling the silo logging formatting off its spinwheel when it would recursively jsonify the logs. Adds an id_read_failure for disassembling ore silos logging all their dropped materials. ## Why It's Good For The Game Hotfixes for a PR ## Changelog 🆑 Bisar fix: Ore silos should be able to be connected/disconnected/disassembled without any issues now. fix: The define for CENTCOM_SPECOPS was incorrectly formatted; it has been fixed. /🆑
This commit is contained in:
@@ -736,7 +736,7 @@
|
||||
/datum/component/material_container/proc/retrieve_all(target = null, atom/context = parent)
|
||||
var/result = 0
|
||||
for(var/MAT in materials)
|
||||
result += retrieve_sheets(amount2sheet(materials[MAT]), MAT, target, context)
|
||||
result += retrieve_sheets(amount2sheet(materials[MAT]), MAT, target, context, user_data = ID_DATA(null))
|
||||
return result
|
||||
//============================================================================================
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ handles linking back and forth.
|
||||
new_container.materials[mat] += mat_amount
|
||||
mat_container.materials[mat] = 0
|
||||
qdel(mat_container)
|
||||
silo.connect_receptacle(src, parent)
|
||||
new_silo.connect_receptacle(src, parent)
|
||||
if(!(mat_container_flags & MATCONTAINER_NO_INSERT))
|
||||
RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert))
|
||||
RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION_SECONDARY, PROC_REF(on_secondary_insert))
|
||||
|
||||
Reference in New Issue
Block a user