Merge pull request #3944 from out-of-phaze/tweak/vendor-materials

Make vendors include products in matter

code/datums/repositories/atom_info.dm

@@ -43,6 +43,7 @@ var/global/repository/atom_info/atom_info_repository = new()
 		qdel(instance)
 
 /repository/atom_info/proc/get_matter_for(var/path, var/material, var/amount)
+	RETURN_TYPE(/list)
 	var/key = create_key_for(path, material, amount)
 	update_cached_info_for(path, material, amount, key)
 	. = matter_cache[key]

code/datums/vending/stored_item.dm

@@ -80,4 +80,16 @@
 /datum/stored_items/proc/migrate(atom/new_storing_obj)
 	storing_object = new_storing_obj
 	for(var/atom/movable/thing in instances)
-		thing.forceMove(new_storing_obj)
+		thing.forceMove(new_storing_obj)
+
+/datum/stored_items/proc/get_combined_matter(include_instances = TRUE)
+	var/virtual_amount = amount - length(instances)
+	if(virtual_amount)
+		. = atom_info_repository.get_matter_for(item_path)?.Copy()
+		for(var/key in .)
+			.[key] *= virtual_amount
+	else
+		. = list()
+	if(include_instances)
+		for(var/atom/instance in instances)
+			. = MERGE_ASSOCS_WITH_NUM_VALUES(., instance.get_contained_matter())

code/game/machinery/vending_deconstruction.dm

@@ -38,6 +38,16 @@
 			return TRUE
 	. = ..()
 
+/obj/structure/vending_refill/get_contained_matter()
+	. = ..()
+	for(var/datum/stored_items/vending_products/record in product_records)
+		. = MERGE_ASSOCS_WITH_NUM_VALUES(., record.get_combined_matter(include_instances = FALSE))
+
+/obj/machinery/vending/get_contained_matter()
+	. = ..()
+	for(var/datum/stored_items/vending_products/record in product_records)
+		. = MERGE_ASSOCS_WITH_NUM_VALUES(., record.get_combined_matter(include_instances = FALSE))
+
 /obj/machinery/vending/dismantle()
 	var/obj/structure/vending_refill/dump = new(loc)
 	dump.SetName("[dump.name] ([name])")