Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors

2026-07-19 19:13:30 +01:00 · 2021-09-11 20:26:54 +02:00
parent 140ee5f008 7cffabf93c
commit f4e58a0961
255 changed files with 1654 additions and 676 deletions
@@ -49,6 +49,10 @@
 			var/mat_path = possible_mats[id]
 			materials[id] = new mat_path()

+/datum/component/material_container/Destroy(force, silent)
+	QDEL_LIST_ASSOC_VAL(materials)
+	return ..()
+
 /datum/component/material_container/proc/OnExamine(datum/source, mob/user, list/examine_list)
 	if(show_on_examine)
 		for(var/I in materials)