Revert "[MIRROR] Port material containers to datum components" (#2597)

* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.

code/__DEFINES/components.dm

@@ -14,7 +14,5 @@
 #define COMSIG_COMPONENT_ADDED "component_added"				//when a component is added to a datum: (datum/component)
 #define COMSIG_COMPONENT_REMOVING "component_removing"			//before a component is removed from a datum because of RemoveComponent: (datum/component)
 #define COMSIG_PARENT_QDELETED "parent_qdeleted"				//before a datum's Destroy() is called: ()
-#define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from the base of atom/attackby: (obj/item, mob/living, params)
-#define COMSIG_PARENT_EXAMINE "atom_examine"                    //from the base of atom/examine: (mob)
-#define COMSIG_ATOM_ENTERED "atom_entered"                      //from base of atom/Entered(): (atom/movable, atom)
-#define COMSIG_MOVABLE_CROSSED "movable_crossed"                //from base of atom/movable/Crossed(): (atom/movable)
+#define COMSIG_ATOM_ENTERED "atom_entered"						//from base of atom/Entered(): (atom/movable, atom)
+#define COMSIG_MOVABLE_CROSSED "movable_crossed"				//from base of atom/movable/Crossed(): (atom/movable)

code/_onclick/item_attack.dm

@@ -16,10 +16,10 @@
 
 // No comment
 /atom/proc/attackby(obj/item/W, mob/user, params)
-	return SendSignal(COMSIG_PARENT_ATTACKBY, list(W, user, params), FALSE)
+	return
 
 /obj/attackby(obj/item/I, mob/living/user, params)
-	return ..() || I.attack_obj(src, user)
+	return I.attack_obj(src, user)
 
 /mob/living/attackby(obj/item/I, mob/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)

code/datums/components.dm

@@ -1,97 +0,0 @@
-/datum/component
-	var/enabled = TRUE      					// Enables or disables the components
-	var/dupe_mode = COMPONENT_DUPE_HIGHLANDER	// How components of the same type are handled in the same parent
-	var/list/signal_procs						// list of signals -> callbacks
-	var/datum/parent							// parent datum
-
-/datum/component/New(datum/P, ...)
-	var/dm = dupe_mode
-	if(dm != COMPONENT_DUPE_ALLOWED)
-		var/datum/component/old = P.GetExactComponent(type)
-		if(old)
-			switch(dm)
-				if(COMPONENT_DUPE_HIGHLANDER)
-					P.RemoveComponent(old)
-					old = null	//in case SendSignal() blocks
-				if(COMPONENT_DUPE_UNIQUE)
-					qdel(src)
-					return
-	P.SendSignal(COMSIG_COMPONENT_ADDED, list(src), FALSE)
-	LAZYADD(P.datum_components, src)
-	parent = P
-
-/datum/component/Destroy()
-	RemoveNoSignal()
-	return ..()
-
-/datum/component/proc/RemoveNoSignal()
-	var/datum/P = parent
-	if(P)
-		LAZYREMOVE(P.datum_components, src)
-		parent = null
-
-/datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE)
-	var/list/procs = signal_procs
-	if(!procs)
-		procs = list()
-		signal_procs = procs
-	
-	if(!override)
-		. = procs[sig_type]
-		if(.)
-			stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
-	
-	procs[sig_type] = CALLBACK(src, proc_on_self)    
-
-/datum/var/list/datum_components //list of /datum/component
-
-// Send a signal to all other components in the container.
-/datum/proc/SendSignal(sigtype, list/sig_args, async = FALSE)
-	var/list/comps = datum_components
-	. = FALSE
-	for(var/I in comps)
-		var/datum/component/C = I
-		if(!C.enabled)
-			continue
-		var/list/sps = C.signal_procs
-		var/datum/callback/CB = LAZYACCESS(sps, sigtype)
-		if(!CB)
-			continue
-		if(!async)
-			. |= CB.Invoke(sig_args)
-		else
-			. |= CB.InvokeAsync(sig_args)
-
-/datum/proc/GetComponent(c_type)
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			return I
-
-/datum/proc/GetExactComponent(c_type)
-	for(var/I in datum_components)
-		var/datum/component/C = I
-		if(C.type == c_type)
-			return I
-
-/datum/proc/GetComponents(c_type)
-	. = list()
-	for(var/I in datum_components)
-		if(istype(I, c_type))
-			. += I
-
-/datum/proc/AddComponents(list/new_types)
-	for(var/new_type in new_types)
-		AddComponent(new_type)
-
-/datum/proc/AddComponent(new_type, ...)
-	var/nt = new_type
-	args[1] = src
-	var/datum/component/C = new nt(arglist(args))
-	return QDELING(C) ? GetComponent(new_type) : C
-
-/datum/proc/RemoveComponent(datum/component/C)
-	if(!C)
-		return
-	C.RemoveNoSignal()
-	SendSignal(COMSIG_COMPONENT_REMOVING, list(C), FALSE)
-	qdel(C)

code/datums/components/README.md

@@ -105,4 +105,4 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
     * Called when a component recieves any signal and is enabled
     * Default implementation looks if the signal is registered and runs the appropriate proc
 
-### See signals and their arguments in __DEFINES\components.dm
+### See/Define signals and their arguments in __DEFINES\components.dm

code/datums/components/powered.dm

@@ -1,6 +0,0 @@
-//These components require a powered machine as a parent to run
-/datum/component/powered
-
-/datum/component/powered/ReceiveSignal(sigtype, list/sig_args, async)
-    var/obj/machinery/M = parent
-    return M.is_operational() && ..()

code/datums/material_container.dm

@@ -5,34 +5,22 @@
 		amount - raw amount of the mineral this container is holding, calculated by the defined value MINERAL_MATERIAL_AMOUNT=2000.
 		max_amount - max raw amount of mineral this container can hold.
 		sheet_type - type of the mineral sheet the container handles, used for output.
-		parent - object that this container is being used by, used for output.
+		owner - object that this container is being used by, used for output.
 		MAX_STACK_SIZE - size of a stack of mineral sheets. Constant.
 */
 
-/datum/component/material_container
+/datum/material_container
 	var/total_amount = 0
 	var/max_amount
 	var/sheet_type
-	var/list/materials
-	var/show_on_examine
-	var/list/allowed_typecache
-	var/last_inserted_type
-	var/last_amount_inserted
-	var/last_insert_success
-	var/datum/callback/precondition
+	var/obj/owner
+	var/list/materials = list()
 	//MAX_STACK_SIZE = 50
 	//MINERAL_MATERIAL_AMOUNT = 2000
 
-/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition)
-	materials = list()
+/datum/material_container/New(obj/O, list/mat_list, max_amt = 0)
+	owner = O
 	max_amount = max(0, max_amt)
-	show_on_examine = _show_on_examine
-	if(allowed_types)
-		allowed_typecache = typecacheof(allowed_types)
-	precondition = _precondition
-
-	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
-	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/OnExamine)
 
 	var/list/possible_mats = list()
 	for(var/mat_type in subtypesof(/datum/material))
@@ -43,47 +31,12 @@
 			var/mat_path = possible_mats[id]
 			materials[id] = new mat_path()
 
-/datum/component/material_container/proc/OnExamine(mob/user)
-	for(var/I in materials)
-		var/datum/material/M = materials[I]
-		var/amt = amount(M.id)
-		if(amt)
-			to_chat(user, "<span class='notice'>It has [amt] units of [lowertext(M.name)] stored.</span>")
-
-/datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
-	var/list/tc = allowed_typecache
-	if(user.a_intent == INTENT_HARM || (I.flags_2 & HOLOGRAM_2) || (tc && !is_type_in_typecache(I, tc)))
-		return FALSE
-	. = TRUE
-	last_insert_success = FALSE
-	var/datum/callback/pc = precondition
-	if(pc && !pc.Invoke())
-		return
-	var/material_amount = get_item_material_amount(I)
-	if(!material_amount)
-		to_chat(user, "<span class='warning'>[I] does not contain sufficient amounts of metal or glass to be accepted by [parent].</span>")
-		return
-	if(!has_space(material_amount))
-		to_chat(user, "<span class='warning'>[parent] is full. Please remove metal or glass from [parent] in order to insert more.</span>")
-		return
-	if(!user.temporarilyRemoveItemFromInventory(I))
-		to_chat(user, "<span class='warning'>[I] is stuck to you and cannot be placed into [parent].</span>")
-		return
-	var/inserted = insert_item(I)
-	if(inserted)
-		last_insert_success = TRUE
-		if(istype(I, /obj/item/stack))
-			to_chat(user, "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] into [parent].</span>")
-			if(!QDELETED(I))
-				user.put_in_active_hand(I)
-		else
-			to_chat(user, "<span class='notice'>You insert a material total of [inserted] into [parent].</span>")
-			qdel(I)
-	else
-		user.put_in_active_hand(I)	
+/datum/material_container/Destroy()
+	owner = null
+	return ..()
 
 //For inserting an amount of material
-/datum/component/material_container/proc/insert_amount(amt, id = null)
+/datum/material_container/proc/insert_amount(amt, id = null)
 	if(amt > 0 && has_space(amt))
 		var/total_amount_saved = total_amount
 		if(id)
@@ -99,7 +52,7 @@
 		return (total_amount - total_amount_saved)
 	return 0
 
-/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt = 0)
+/datum/material_container/proc/insert_stack(obj/item/stack/S, amt = 0)
 	if(amt <= 0)
 		return 0
 	if(amt > S.amount)
@@ -114,12 +67,10 @@
 		return 0
 
 	insert_materials(S,amt)
-	last_inserted_type = S.type
 	S.use(amt)
-	last_amount_inserted = amt
 	return amt
 
-/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1)
+/datum/material_container/proc/insert_item(obj/item/I, multiplier = 1)
 	if(!I)
 		return 0
 	if(istype(I, /obj/item/stack))
@@ -131,11 +82,9 @@
 		return 0
 
 	insert_materials(I, multiplier)
-	last_inserted_type = I.type
-	last_amount_inserted = material_amount
 	return material_amount
 
-/datum/component/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only
+/datum/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only
 	var/datum/material/M
 	for(var/MAT in materials)
 		M = materials[MAT]
@@ -144,7 +93,7 @@
 
 //For consuming material
 //mats is a list of types of material to use and the corresponding amounts, example: list(MAT_METAL=100, MAT_GLASS=200)
-/datum/component/material_container/proc/use_amount(list/mats, multiplier=1)
+/datum/material_container/proc/use_amount(list/mats, multiplier=1)
 	if(!mats || !mats.len)
 		return 0
 
@@ -163,7 +112,7 @@
 	return total_amount_save - total_amount
 
 
-/datum/component/material_container/proc/use_amount_type(amt, id)
+/datum/material_container/proc/use_amount_type(amt, id)
 	var/datum/material/M = materials[id]
 	if(M)
 		if(M.amount >= amt)
@@ -172,7 +121,7 @@
 			return amt
 	return 0
 
-/datum/component/material_container/proc/can_use_amount(amt, id, list/mats)
+/datum/material_container/proc/can_use_amount(amt, id, list/mats)
 	if(amt && id)
 		var/datum/material/M = materials[id]
 		if(M && M.amount >= amt)
@@ -187,7 +136,7 @@
 	return FALSE
 
 //For spawning mineral sheets; internal use only
-/datum/component/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null)
+/datum/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null)
 	if(!M.sheet_type)
 		return 0
 	if(sheet_amt > 0)
@@ -195,12 +144,12 @@
 			sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
 		var/count = 0
 		while(sheet_amt > MAX_STACK_SIZE)
-			new M.sheet_type(get_turf(parent), MAX_STACK_SIZE)
+			new M.sheet_type(get_turf(owner), MAX_STACK_SIZE)
 			count += MAX_STACK_SIZE
 			use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
 			sheet_amt -= MAX_STACK_SIZE
 		if(round((sheet_amt * MINERAL_MATERIAL_AMOUNT) / MINERAL_MATERIAL_AMOUNT))
-			var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(parent), sheet_amt)
+			var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(owner), sheet_amt)
 			if(target)
 				s.forceMove(target)
 			count += sheet_amt
@@ -208,15 +157,15 @@
 		return count
 	return 0
 
-/datum/component/material_container/proc/retrieve_sheets(sheet_amt, id, target = null)
+/datum/material_container/proc/retrieve_sheets(sheet_amt, id, target = null)
 	if(materials[id])
 		return retrieve(sheet_amt, materials[id], target)
 	return 0
 
-/datum/component/material_container/proc/retrieve_amount(amt, id, target)
+/datum/material_container/proc/retrieve_amount(amt, id, target)
 	return retrieve_sheets(amount2sheet(amt), id, target)
 
-/datum/component/material_container/proc/retrieve_all(target = null)
+/datum/material_container/proc/retrieve_all(target = null)
 	var/result = 0
 	var/datum/material/M
 	for(var/MAT in materials)
@@ -224,10 +173,10 @@
 		result += retrieve_sheets(amount2sheet(M.amount), MAT, target)
 	return result
 
-/datum/component/material_container/proc/has_space(amt = 0)
+/datum/material_container/proc/has_space(amt = 0)
 	return (total_amount + amt) <= max_amount
 
-/datum/component/material_container/proc/has_materials(list/mats, multiplier=1)
+/datum/material_container/proc/has_materials(list/mats, multiplier=1)
 	if(!mats || !mats.len)
 		return 0
 
@@ -238,23 +187,23 @@
 			return 0
 	return 1
 
-/datum/component/material_container/proc/amount2sheet(amt)
+/datum/material_container/proc/amount2sheet(amt)
 	if(amt >= MINERAL_MATERIAL_AMOUNT)
 		return round(amt / MINERAL_MATERIAL_AMOUNT)
 	return 0
 
-/datum/component/material_container/proc/sheet2amount(sheet_amt)
+/datum/material_container/proc/sheet2amount(sheet_amt)
 	if(sheet_amt > 0)
 		return sheet_amt * MINERAL_MATERIAL_AMOUNT
 	return 0
 
-/datum/component/material_container/proc/amount(id)
+/datum/material_container/proc/amount(id)
 	var/datum/material/M = materials[id]
 	return M ? M.amount : 0
 
 //returns the amount of material relevant to this container;
 //if this container does not support glass, any glass in 'I' will not be taken into account
-/datum/component/material_container/proc/get_item_material_amount(obj/item/I)
+/datum/material_container/proc/get_item_material_amount(obj/item/I)
 	if(!istype(I))
 		return 0
 	var/material_amount = 0
@@ -329,4 +278,4 @@
 
 /datum/material/biomass
 	name = "Biomass"
-	id = MAT_BIOMASS
+	id = MAT_BIOMASS

code/game/atoms.dm

@@ -290,7 +290,6 @@
 				to_chat(user, "[total_volume] units of various reagents")
 		else
 			to_chat(user, "Nothing.")
-	SendSignal(COMSIG_PARENT_EXAMINE, list(user), FALSE)
 
 /atom/proc/relaymove()
 	return

code/game/machinery/autolathe.dm

@@ -32,6 +32,8 @@
 	var/selected_category
 	var/screen = 1
 
+	var/datum/material_container/materials
+
 	var/list/categories = list(
 							"Tools",
 							"Electronics",
@@ -46,15 +48,15 @@
 							)
 
 /obj/machinery/autolathe/Initialize()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS))
-	. = ..()
-
+	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS))
 	wires = new /datum/wires/autolathe(src)
 	files = new /datum/research/autolathe(src)
 	matching_designs = list()
+	return ..()
 
 /obj/machinery/autolathe/Destroy()
 	QDEL_NULL(wires)
+	QDEL_NULL(materials)
 	return ..()
 
 /obj/machinery/autolathe/interact(mob/user)
@@ -79,7 +81,6 @@
 	popup.open()
 
 /obj/machinery/autolathe/on_deconstruction()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 
 /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params)
@@ -122,26 +123,42 @@
 		busy = FALSE
 		return 1
 
-	return ..()
+	if(O.flags_2 & HOLOGRAM_2)
+		return 1
 
-/obj/machinery/mecha_part_fabricator/ComponentActivated(datum/component/C)
-	..()
-	if(istype(C, /datum/component/material_container))
-		var/datum/component/material_container/M = C
-		if(!M.last_insert_success)
-			return
-		var/lit = M.last_inserted_type
-		if(ispath(lit, /obj/item/ore/bluespace_crystal))
-			use_power(max(500,M.last_amount_inserted/10))
-		else
-			var/obj/item/stack/S = lit
-			var/list/initmats = initial(S.materials)
-			if (initmats[MAT_METAL])
+	var/material_amount = materials.get_item_material_amount(O)
+	if(!material_amount)
+		to_chat(user, "<span class='warning'>This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.</span>")
+		return 1
+	if(!materials.has_space(material_amount))
+		to_chat(user, "<span class='warning'>The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.</span>")
+		return 1
+	if(!user.temporarilyRemoveItemFromInventory(O))
+		to_chat(user, "<span class='warning'>\The [O] is stuck to you and cannot be placed into the autolathe.</span>")
+		return 1
+
+	busy = TRUE
+	var/inserted = materials.insert_item(O)
+	if(inserted)
+		if(istype(O, /obj/item/stack))
+			if (O.materials[MAT_METAL])
 				flick("autolathe_o",src)//plays metal insertion animation
-			if (initmats[MAT_GLASS])
+			if (O.materials[MAT_GLASS])
 				flick("autolathe_r",src)//plays glass insertion animation
-			use_power(M.last_amount_inserted*100)
-		updateUsrDialog()
+			to_chat(user, "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.</span>")
+			use_power(inserted*100)
+			if(!QDELETED(O))
+				user.put_in_active_hand(O)
+		else
+			to_chat(user, "<span class='notice'>You insert a material total of [inserted] to the autolathe.</span>")
+			use_power(max(500,inserted/10))
+			qdel(O)
+	else
+		user.put_in_active_hand(O)
+
+	busy = FALSE
+	updateUsrDialog()
+	return 1
 
 /obj/machinery/autolathe/Topic(href, href_list)
 	if(..())
@@ -176,7 +193,6 @@
 
 			var/power = max(2000, (metal_cost+glass_cost)*multiplier/5)
 
-			GET_COMPONENT(materials, /datum/component/material_container)
 			if((materials.amount(MAT_METAL) >= metal_cost*multiplier*coeff) && (materials.amount(MAT_GLASS) >= glass_cost*multiplier*coeff))
 				busy = TRUE
 				use_power(power)
@@ -230,7 +246,6 @@
 	var/T = 0
 	for(var/obj/item/stock_parts/matter_bin/MB in component_parts)
 		T += MB.rating*75000
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = T
 	T=1.2
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
@@ -279,7 +294,6 @@
 			dat += "<a href='?src=\ref[src];make=[D.id];multiplier=1'>[D.name]</a>"
 
 		if(ispath(D.build_path, /obj/item/stack))
-			GET_COMPONENT(materials, /datum/component/material_container)
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
 			if (max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
@@ -311,7 +325,6 @@
 			dat += "<a href='?src=\ref[src];make=[D.id];multiplier=1'>[D.name]</a>"
 
 		if(ispath(D.build_path, /obj/item/stack))
-			GET_COMPONENT(materials, /datum/component/material_container)
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
 			if (max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
@@ -326,7 +339,6 @@
 	return dat
 
 /obj/machinery/autolathe/proc/materials_printout()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/dat = "<b>Total amount:</b> [materials.total_amount] / [materials.max_amount] cm<sup>3</sup><br>"
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
@@ -339,7 +351,6 @@
 
 	var/coeff = (ispath(D.build_path, /obj/item/stack) ? 1 : prod_coeff)
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] * coeff * amount)))
 		return 0
 	if(D.materials[MAT_GLASS] && (materials.amount(MAT_GLASS) < (D.materials[MAT_GLASS] * coeff * amount)))
@@ -392,4 +403,4 @@
 //Called when the object is constructed by an autolathe
 //Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes
 /obj/item/proc/autolathe_crafted(obj/machinery/autolathe/A)
-	return
+	return

code/game/machinery/droneDispenser.dm

@@ -22,6 +22,7 @@
 	var/icon_recharging = "recharge"
 	var/icon_creating = "make"
 
+	var/datum/material_container/materials
 	var/list/using_materials
 	var/starting_amount = 0
 	var/metal_cost = 1000
@@ -54,10 +55,14 @@
 
 /obj/machinery/droneDispenser/Initialize()
 	. = ..()
-	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
+	materials = new(src, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2)
 	materials.insert_amount(starting_amount)
 	using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
 
+/obj/machinery/droneDispenser/Destroy()
+	QDEL_NULL(materials)
+	return ..()
+
 /obj/machinery/droneDispenser/preloaded
 	starting_amount = 5000
 
@@ -143,6 +148,10 @@
 	..()
 	if((mode == DRONE_RECHARGING) && !stat && recharging_text)
 		to_chat(user, "<span class='warning'>[recharging_text]</span>")
+	if(metal_cost)
+		to_chat(user, "<span class='notice'>It has [materials.amount(MAT_METAL)] units of metal stored.</span>")
+	if(glass_cost)
+		to_chat(user, "<span class='notice'>It has [materials.amount(MAT_GLASS)] units of glass stored.</span>")
 
 /obj/machinery/droneDispenser/power_change()
 	..()
@@ -157,7 +166,6 @@
 	if((stat & (NOPOWER|BROKEN)) || !anchored)
 		return
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	if(!materials.has_materials(using_materials))
 		return // We require more minerals
 
@@ -224,8 +232,25 @@
 		icon_state = icon_on
 
 /obj/machinery/droneDispenser/attackby(obj/item/O, mob/living/user)
-	if(istype(O, /obj/item/crowbar))
-		GET_COMPONENT(materials, /datum/component/material_container)
+	if(istype(O, /obj/item/stack))
+		if(!O.materials[MAT_METAL] && !O.materials[MAT_GLASS])
+			return ..()
+		if(!metal_cost && !glass_cost)
+			to_chat(user, "<span class='warning'>There isn't a place to insert [O]!</span>")
+			return
+		var/obj/item/stack/sheets = O
+		if(!user.canUnEquip(sheets))
+			to_chat(user, "<span class='warning'>[O] is stuck to your hand, you can't get it off!</span>")
+			return
+
+		var/used = materials.insert_stack(sheets, sheets.amount)
+
+		if(used)
+			to_chat(user, "<span class='notice'>You insert [used] sheet[used > 1 ? "s" : ""] into [src].</span>")
+		else
+			to_chat(user, "<span class='warning'>The [src] isn't accepting the [sheets].</span>")
+
+	else if(istype(O, /obj/item/crowbar))
 		materials.retrieve_all()
 		playsound(loc, O.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You retrieve the materials from [src].</span>")
@@ -284,4 +309,4 @@
 
 #undef DRONE_PRODUCTION
 #undef DRONE_RECHARGING
-#undef DRONE_READY
+#undef DRONE_READY

code/game/machinery/recycler.dm

@@ -14,14 +14,15 @@
 	var/blood = 0
 	var/eat_dir = WEST
 	var/amount_produced = 50
+	var/datum/material_container/materials
 	var/crush_damage = 1000
 	var/eat_victim_items = TRUE
 	var/item_recycle_sound = 'sound/items/welder.ogg'
 
 /obj/machinery/recycler/Initialize()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
-	. = ..()
+	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
 	update_icon()
+	return ..()
 
 /obj/machinery/recycler/RefreshParts()
 	var/amt_made = 0
@@ -31,7 +32,6 @@
 	mat_mod *= 50000
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		amt_made = 12.5 * M.rating //% of materials salvaged
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = mat_mod
 	amount_produced = min(50, amt_made) + 50
 
@@ -126,7 +126,6 @@
 /obj/machinery/recycler/proc/recycle_item(obj/item/I)
 	I.loc = src.loc
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(I)
 	if(!material_amount)
 		qdel(I)
@@ -194,4 +193,4 @@
 	name = "paper - 'garbage duty instructions'"
 	info = "<h2>New Assignment</h2> You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.<br><br>There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
 
-#undef SAFETY_COOLDOWN
+#undef SAFETY_COOLDOWN

code/game/mecha/mech_fabricator.dm

@@ -12,6 +12,7 @@
 	circuit = /obj/item/circuitboard/machine/mechfab
 	var/time_coeff = 1
 	var/component_coeff = 1
+	var/datum/material_container/materials
 	var/datum/research/files
 	var/sync = 0
 	var/part_set
@@ -35,11 +36,9 @@
 								)
 
 /obj/machinery/mecha_part_fabricator/Initialize()
-	AddComponent(/datum/component/material_container,
-	 list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
-		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
-	. = ..()
 	files = new /datum/research(src) //Setup the research data holder.
+	materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE))
+	return ..()
 
 /obj/machinery/mecha_part_fabricator/RefreshParts()
 	var/T = 0
@@ -47,7 +46,6 @@
 	//maximum stocking amount (default 300000, 600000 at T4)
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		T += M.rating
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = (200000 + (T*50000))
 
 	//resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55)
@@ -115,7 +113,6 @@
 
 /obj/machinery/mecha_part_fabricator/proc/output_available_resources()
 	var/output
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		output += "<span class=\"res_name\">[M.name]: </span>[M.amount] cm&sup3;"
@@ -136,7 +133,6 @@
 /obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D)
 	if(D.reagents_list.len) // No reagents storage - no reagent designs.
 		return 0
-	GET_COMPONENT(materials, /datum/component/material_container)
 	if(materials.has_materials(get_resources_w_coeff(D)))
 		return 1
 	return 0
@@ -146,7 +142,6 @@
 	desc = "It's building \a [initial(D.name)]."
 	var/list/res_coef = get_resources_w_coeff(D)
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.use_amount(res_coef)
 	add_overlay("fab-active")
 	use_power = ACTIVE_POWER_USE
@@ -403,34 +398,15 @@
 					break
 
 	if(href_list["remove_mat"] && href_list["material"])
-		GET_COMPONENT(materials, /datum/component/material_container)
 		materials.retrieve_sheets(text2num(href_list["remove_mat"]), href_list["material"])
 
 	updateUsrDialog()
 	return
 
 /obj/machinery/mecha_part_fabricator/on_deconstruction()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 
-/obj/machinery/mecha_part_fabricator/ComponentActivated(datum/component/C)
-	..()
-	if(istype(C, /datum/component/material_container))
-		var/datum/component/material_container/M = C
-		if(!M.last_insert_success)
-			return
-		var/lit = M.last_inserted_type
-		var/stack_name
-		if(ispath(lit, /obj/item/ore/bluespace_crystal))
-			stack_name = "bluespace"
-		else
-			var/obj/item/stack/S = lit
-			stack_name = material2name(initial(S.materials)[1])
-		add_overlay("fab-load-[stack_name]")
-		addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10)
-		updateUsrDialog()
-
 /obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W))
 		return 1
@@ -441,7 +417,55 @@
 	if(default_deconstruction_crowbar(W))
 		return 1
 
-	return ..()
+	if(istype(W, /obj/item/stack/sheet))
+
+		if(!is_insertion_ready(user))
+			return 1
+
+		var/material_amount = materials.get_item_material_amount(W)
+
+		if(!try_insert(user, W, material_amount))
+			return 1
+
+		var/inserted = materials.insert_item(W)
+		if(inserted)
+			to_chat(user, "<span class='notice'>You insert [inserted] sheet\s into [src].</span>")
+			if(W && W.materials.len)
+				if(!QDELETED(W))
+					user.put_in_active_hand(W)
+				var/mat_overlay = "fab-load-[material2name(W.materials[1])]"
+				add_overlay(mat_overlay)
+				sleep(10)
+				if(!QDELETED(src))
+					cut_overlay(mat_overlay) //No matter what the overlay shall still be deleted
+
+		updateUsrDialog()
+
+	else if(istype(W, /obj/item/ore/bluespace_crystal))
+
+		if(!is_insertion_ready(user))
+			return 1
+
+		var/material_amount = materials.get_item_material_amount(W)
+
+		if(!try_insert(user, W, material_amount))
+			return 1
+
+		var/inserted = materials.insert_item(W)
+		if(inserted)
+			to_chat(user, "<span class='notice'>You add [W] to the [src].</span>")
+			if(W && W.materials.len)
+				qdel(W)
+				var/mat_overlay = "fab-load-bluespace"
+				add_overlay(mat_overlay)
+				sleep(10)
+				if(!QDELETED(src))
+					cut_overlay(mat_overlay)
+
+		updateUsrDialog()
+
+	else
+		return ..()
 
 /obj/machinery/mecha_part_fabricator/proc/material2name(ID)
 	return copytext(ID,2)
@@ -454,4 +478,18 @@
 		to_chat(user, "<span class='warning'>\The [src] is currently processing! Please wait until completion.</span>")
 		return FALSE
 
+	return TRUE
+
+
+/obj/machinery/mecha_part_fabricator/proc/try_insert(mob/user, obj/item/I, material_amount)
+	if(!material_amount)
+		to_chat(user, "<span class='warning'>This object does not contain sufficient amounts of materials to be accepted by [src].</span>")
+		return FALSE
+	if(!materials.has_space(material_amount))
+		to_chat(user, "<span class='warning'>\The [src] is full. Please remove some materials from [src] in order to insert more.</span>")
+		return FALSE
+	if(!user.temporarilyRemoveItemFromInventory(I))
+		to_chat(user, "<span class='warning'>\The [I] is stuck to you and cannot be placed into [src].</span>")
+		return FALSE
+
 	return TRUE

code/modules/clothing/shoes/bananashoes.dm

@@ -5,11 +5,12 @@
 	desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
 	icon_state = "clown_prototype_off"
 	var/on = FALSE
+	var/datum/material_container/bananium
 	actions_types = list(/datum/action/item_action/toggle)
 
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
-	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_BANANIUM), 200000, TRUE)
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/New()
+	..()
+	bananium = new/datum/material_container(src,list(MAT_BANANIUM),200000)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
 	if(on)
@@ -20,7 +21,6 @@
 			footstep++
 
 		new/obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk
-		GET_COMPONENT(bananium, /datum/component/material_container)
 		bananium.use_amount_type(100, MAT_BANANIUM)
 		if(bananium.amount(MAT_BANANIUM) < 100)
 			on = !on
@@ -31,19 +31,33 @@
 		..()
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
-	GET_COMPONENT(bananium, /datum/component/material_container)
 	var/sheet_amount = bananium.retrieve_all()
 	if(sheet_amount)
 		to_chat(user, "<span class='notice'>You retrieve [sheet_amount] sheets of bananium from the prototype shoes.</span>")
 	else
 		to_chat(user, "<span class='notice'>You cannot retrieve any bananium from the prototype shoes.</span>")
 
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/attackby(obj/item/O, mob/user, params)
+	if(!bananium.get_item_material_amount(O))
+		to_chat(user, "<span class='notice'>This item has no bananium!</span>")
+		return
+	if(!user.dropItemToGround(O))
+		to_chat(user, "<span class='notice'>You can't drop [O]!</span>")
+		return
+
+	var/bananium_amount = bananium.insert_item(O)
+	if(bananium_amount)
+		to_chat(user, "<span class='notice'>You insert [O] into the prototype shoes.</span>")
+		qdel(O)
+	else
+		to_chat(user, "<span class='notice'>You are unable to insert more bananium!</span>")
+
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
 	..()
-	to_chat(user, "<span class='notice'>The shoes are [on ? "enabled" : "disabled"]</span>")
+	var/ban_amt = bananium.amount(MAT_BANANIUM)
+	to_chat(user, "<span class='notice'>The shoes are [on ? "enabled" : "disabled"]. There is [ban_amt ? ban_amt : "no"] bananium left.</span>")
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
-	GET_COMPONENT(bananium, /datum/component/material_container)
 	if(bananium.amount(MAT_BANANIUM))
 		on = !on
 		update_icon()
@@ -63,4 +77,4 @@
 	usr.update_inv_shoes()
 	for(var/X in actions)
 		var/datum/action/A = X
-		A.UpdateButtonIcon()
+		A.UpdateButtonIcon()

code/modules/mining/machine_processing.dm

@@ -66,6 +66,7 @@
 	density = TRUE
 	anchored = TRUE
 	var/obj/machinery/mineral/CONSOLE = null
+	var/datum/material_container/materials
 	var/on = FALSE
 	var/selected_material = MAT_METAL
 	var/selected_alloy = null
@@ -74,11 +75,12 @@
 /obj/machinery/mineral/processing_unit/Initialize()
 	. = ..()
 	proximity_monitor = new(src, 1)
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), INFINITY)
+	materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
 	files = new /datum/research/smelter(src)
 
 /obj/machinery/mineral/processing_unit/Destroy()
 	CONSOLE = null
+	QDEL_NULL(materials)
 	QDEL_NULL(files)
 	return ..()
 
@@ -87,7 +89,6 @@
 		process_ore(AM)
 
 /obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/ore/O)
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(O)
 	if(!materials.has_space(material_amount))
 		unload_mineral(O)
@@ -99,7 +100,6 @@
 
 /obj/machinery/mineral/processing_unit/proc/get_machine_data()
 	var/dat = "<b>Smelter control console</b><br><br>"
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		dat += "<span class=\"res_name\">[M.name]: </span>[M.amount] cm&sup3;"
@@ -165,7 +165,6 @@
 				continue*/
 
 /obj/machinery/mineral/processing_unit/proc/smelt_ore()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/datum/material/mat = materials.materials[selected_material]
 	if(mat)
 		var/sheets_to_remove = (mat.amount >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT) ) ? SMELT_AMOUNT : round(mat.amount /  MINERAL_MATERIAL_AMOUNT)
@@ -188,7 +187,6 @@
 		on = FALSE
 		return
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.use_amount(alloy.materials, amount)
 
 	generate_mineral(alloy.build_path)
@@ -199,7 +197,6 @@
 
 	var/build_amount = SMELT_AMOUNT
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 
 	for(var/mat_id in D.materials)
 		var/M = D.materials[mat_id]
@@ -217,7 +214,6 @@
 	unload_mineral(O)
 
 /obj/machinery/mineral/processing_unit/on_deconstruction()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 

code/modules/mining/machine_redemption.dm

@@ -22,15 +22,17 @@
 	var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60)
 	var/message_sent = FALSE
 	var/list/ore_buffer = list()
+	var/datum/material_container/materials
 	var/datum/research/files
 	var/obj/item/disk/design_disk/inserted_disk
 
 /obj/machinery/mineral/ore_redemption/Initialize()
 	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
+	materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
 	files = new /datum/research/smelter(src)
 
 /obj/machinery/mineral/ore_redemption/Destroy()
+	QDEL_NULL(materials)
 	QDEL_NULL(files)
 	return ..()
 
@@ -55,7 +57,6 @@
 	if(O && O.refined_type)
 		points += O.points * point_upgrade
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(O)
 
 	if(!material_amount)
@@ -74,7 +75,6 @@
 
 	var/build_amount = 0
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in D.materials)
 		var/M = D.materials[mat_id]
 		var/datum/material/redemption_mat = materials.materials[mat_id]
@@ -110,7 +110,6 @@
 
 	var/has_minerals = FALSE
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		var/mineral_amount = M.amount / MINERAL_MATERIAL_AMOUNT
@@ -149,7 +148,6 @@
 /obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params)
 	if(exchange_parts(user, W))
 		return
-	GET_COMPONENT(materials, /datum/component/material_container)
 	if(default_pry_open(W))
 		materials.retrieve_all()
 		return
@@ -183,10 +181,16 @@
 		if(user.transferItemToLoc(W, src))
 			inserted_disk = W
 			return TRUE
+
+	if(istype(W, /obj/item/stack/sheet))
+		var/obj/item/stack/sheet/S = W
+		var/inserted = materials.insert_stack(S, S.amount)
+		to_chat(user, "<span class='notice'>You add [inserted] [S] sheets to \the [src].</span>")
+		return
+
 	return ..()
 
 /obj/machinery/mineral/ore_redemption/on_deconstruction()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 
@@ -209,7 +213,6 @@
 		data["claimedPoints"] = inserted_id.mining_points
 
 	data["materials"] = list()
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		var/sheet_amount = M.amount ? M.amount / MINERAL_MATERIAL_AMOUNT : "0"
@@ -233,7 +236,6 @@
 /obj/machinery/mineral/ore_redemption/ui_act(action, params)
 	if(..())
 		return
-	GET_COMPONENT(materials, /datum/component/material_container)
 	switch(action)
 		if("Eject")
 			if(!inserted_id)
@@ -352,4 +354,4 @@
 		icon_state = initial(icon_state)
 	else
 		icon_state = "[initial(icon_state)]-off"
-	return
+	return

code/modules/mining/mint.dm

@@ -5,32 +5,37 @@
 	name = "coin press"
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "coinpress0"
-	density = TRUE
-	anchored = TRUE
+	density = TRUE
+	anchored = TRUE
+	var/datum/material_container/materials
 	var/newCoins = 0   //how many coins the machine made in it's last load
-	var/processing = FALSE
+	var/processing = FALSE
 	var/chosen = MAT_METAL //which material will be used to make coins
 	var/coinsToProduce = 10
 	speed_process = 1
 
 
-/obj/machinery/mineral/mint/Initialize()
-	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM), MINERAL_MATERIAL_AMOUNT * 50)
+/obj/machinery/mineral/mint/Initialize()
+	. = ..()
+	materials = new /datum/material_container(src,
+		list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM),
+		max_amt = MINERAL_MATERIAL_AMOUNT*50)
+
+/obj/machinery/mineral/mint/Destroy()
+	QDEL_NULL(materials)
+	return ..()
 
 /obj/machinery/mineral/mint/process()
 	var/turf/T = get_step(src, input_dir)
 	if(!T)
 		return
-	
-	GET_COMPONENT(materials, /datum/component/material_container)
+
 	for(var/obj/item/stack/sheet/O in T)
 		materials.insert_stack(O, O.amount)
 
 /obj/machinery/mineral/mint/attack_hand(mob/user)
 	var/dat = "<b>Coin Press</b><br>"
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		if(!M.amount && chosen != mat_id)
@@ -63,7 +68,6 @@
 	if(processing==1)
 		to_chat(usr, "<span class='notice'>The machine is processing.</span>")
 		return
-	GET_COMPONENT(materials, /datum/component/material_container)
 	if(href_list["choose"])
 		if(materials.materials[href_list["choose"]])
 			chosen = href_list["choose"]
@@ -71,7 +75,7 @@
 		coinsToProduce = Clamp(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
 	if(href_list["makeCoins"])
 		var/temp_coins = coinsToProduce
-		processing = TRUE
+		processing = TRUE
 		icon_state = "coinpress1"
 		var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
 		var/datum/material/M = materials.materials[chosen]
@@ -87,7 +91,7 @@
 			sleep(5)
 
 		icon_state = "coinpress0"
-		processing = FALSE
+		processing = FALSE
 		coinsToProduce = temp_coins
 	src.updateUsrDialog()
 	return

code/modules/research/circuitprinter.dm

@@ -11,6 +11,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	container_type = OPENCONTAINER_1
 	circuit = /obj/item/circuitboard/machine/circuit_imprinter
 
+	var/datum/material_container/materials
 	var/efficiency_coeff
 
 	var/list/categories = list(
@@ -28,18 +29,20 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 								)
 
 /obj/machinery/r_n_d/circuit_imprinter/Initialize()
-	AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE),
-		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
+	materials = new(src, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE))
 	create_reagents(0)
 	return ..()
 
+/obj/machinery/r_n_d/circuit_imprinter/Destroy()
+	QDEL_NULL(materials)
+	return ..()
+
 /obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
 	reagents.maximum_volume = 0
 	for(var/obj/item/reagent_containers/glass/G in component_parts)
 		reagents.maximum_volume += G.volume
 		G.reagents.trans_to(src, G.reagents.total_volume)
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = 0
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		materials.max_amount += M.rating * 75000
@@ -56,7 +59,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 /obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, M)	// now returns how many times the item can be built with the material
 	var/list/all_materials = being_built.reagents_list + being_built.materials
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/A = materials.amount(M)
 	if(!A)
 		A = reagents.get_reagent_amount(M)
@@ -67,7 +69,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 /obj/machinery/r_n_d/circuit_imprinter/on_deconstruction()
 	for(var/obj/item/reagent_containers/glass/G in component_parts)
 		reagents.trans_to(G, G.reagents.maximum_volume)
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 
@@ -76,20 +77,52 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	linked_console.linked_imprinter = null
 	..()
 
-/obj/machinery/r_n_d/circuit_imprinter/ComponentActivated(datum/component/C)
-	..()
-	if(istype(C, /datum/component/material_container))
-		var/datum/component/material_container/M = C
-		if(!M.last_insert_success)
+/obj/machinery/r_n_d/circuit_imprinter/Insert_Item(obj/item/O, mob/user)
+
+	if(istype(O, /obj/item/stack/sheet))
+		. = 1
+		if(!is_insertion_ready(user))
 			return
-		var/lit = M.last_inserted_type
-		var/stack_name
-		if(ispath(lit, /obj/item/ore/bluespace_crystal))
-			stack_name = "bluespace"
-			use_power(MINERAL_MATERIAL_AMOUNT / 10)
+		var/sheet_material = materials.get_item_material_amount(O)
+		if(!sheet_material)
+			return
+
+		if(!materials.has_space(sheet_material))
+			to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
+			return 1
+
+		var/obj/item/stack/sheet/stack = O
+		var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
+		if(!in_range(src, stack) || !user.Adjacent(src))
+			return
+		var/amount_inserted = materials.insert_stack(O,amount)
+		if(!amount_inserted)
+			return 1
 		else
-			var/obj/item/stack/S = lit
-			stack_name = initial(S.name)
-			use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
-		add_overlay("protolathe_[stack_name]")
-		addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
+			use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
+			to_chat(user, "<span class='notice'>You add [amount_inserted] sheets to the [src.name].</span>")
+		updateUsrDialog()
+
+	else if(istype(O, /obj/item/ore/bluespace_crystal)) //Bluespace crystals can be either a stack or an item
+		. = 1
+		if(!is_insertion_ready(user))
+			return
+		var/bs_material = materials.get_item_material_amount(O)
+		if(!bs_material)
+			return
+
+		if(!materials.has_space(bs_material))
+			to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
+			return 1
+
+		materials.insert_item(O)
+		use_power(MINERAL_MATERIAL_AMOUNT/10)
+		to_chat(user, "<span class='notice'>You add [O] to the [src.name].</span>")
+		qdel(O)
+		updateUsrDialog()
+
+	else if(user.a_intent != INTENT_HARM)
+		to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
+		return 1
+	else
+		return 0

code/modules/research/experimentor.dm

@@ -418,9 +418,8 @@
 	if(exp == SCANTYPE_OBLITERATE)
 		visible_message("<span class='warning'>[exp_on] activates the crushing mechanism, [exp_on] is destroyed!</span>")
 		if(linked_console.linked_lathe)
-			GET_COMPONENT_FROM(linked_materials, /datum/component/material_container, linked_console.linked_lathe)
 			for(var/material in exp_on.materials)
-				linked_materials.insert_amount( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.materials[material])), material)
+				linked_console.linked_lathe.materials.insert_amount( min((linked_console.linked_lathe.materials.max_amount - linked_console.linked_lathe.materials.total_amount), (exp_on.materials[material])), material)
 		if(prob(EFFECT_PROB_LOW) && criticalReaction)
 			visible_message("<span class='warning'>[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!</span>")
 			new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
@@ -707,4 +706,4 @@
 	if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK!
 		message_admins("[RelicType] relic activated by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
 	log_game(log_msg)
-	investigate_log(log_msg, "experimentor")
+	investigate_log(log_msg, "experimentor")

code/modules/research/protolathe.dm

@@ -14,6 +14,7 @@ Note: Must be placed west/left of and R&D console to function.
 	container_type = OPENCONTAINER_1
 	circuit = /obj/item/circuitboard/machine/protolathe
 
+	var/datum/material_container/materials
 	var/efficiency_coeff
 
 	var/list/categories = list(
@@ -33,9 +34,11 @@ Note: Must be placed west/left of and R&D console to function.
 
 /obj/machinery/r_n_d/protolathe/Initialize()
 	create_reagents(0)
-	AddComponent(/datum/component/material_container,
-		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
-		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
+	materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE))
+	return ..()
+
+/obj/machinery/r_n_d/protolathe/Destroy()
+	QDEL_NULL(materials)
 	return ..()
 
 /obj/machinery/r_n_d/protolathe/RefreshParts()
@@ -44,7 +47,6 @@ Note: Must be placed west/left of and R&D console to function.
 		reagents.maximum_volume += G.volume
 		G.reagents.trans_to(src, G.reagents.total_volume)
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = 0
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		materials.max_amount += M.rating * 75000
@@ -57,7 +59,6 @@ Note: Must be placed west/left of and R&D console to function.
 /obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, M)	// now returns how many times the item can be built with the material
 	var/list/all_materials = being_built.reagents_list + being_built.materials
 
-	GET_COMPONENT(materials, /datum/component/material_container)
 	var/A = materials.amount(M)
 	if(!A)
 		A = reagents.get_reagent_amount(M)
@@ -68,7 +69,6 @@ Note: Must be placed west/left of and R&D console to function.
 /obj/machinery/r_n_d/protolathe/on_deconstruction()
 	for(var/obj/item/reagent_containers/glass/G in component_parts)
 		reagents.trans_to(G, G.reagents.maximum_volume)
-	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 
@@ -77,20 +77,63 @@ Note: Must be placed west/left of and R&D console to function.
 	linked_console.linked_lathe = null
 	..()
 
-/obj/machinery/r_n_d/protolathe/ComponentActivated(datum/component/C)
-	..()
-	if(istype(C, /datum/component/material_container))
-		var/datum/component/material_container/M = C
-		if(!M.last_insert_success)
+/obj/machinery/r_n_d/protolathe/Insert_Item(obj/item/O, mob/user)
+
+	if(istype(O, /obj/item/stack/sheet))
+		. = 1
+		if(!is_insertion_ready(user))
 			return
-		var/lit = M.last_inserted_type
-		var/stack_name
-		if(ispath(lit, /obj/item/ore/bluespace_crystal))
-			stack_name = "bluespace"
-			use_power(MINERAL_MATERIAL_AMOUNT / 10)
+		var/sheet_material = materials.get_item_material_amount(O)
+		if(!sheet_material)
+			return
+
+		if(!materials.has_space(sheet_material))
+			to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
+			return 1
+
+		var/obj/item/stack/sheet/stack = O
+		var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
+		if(!in_range(src, stack) || !user.Adjacent(src))
+			return
+		var/amount_inserted = materials.insert_stack(O,amount)
+		if(!amount_inserted)
+			return 1
 		else
-			var/obj/item/stack/S = lit
-			stack_name = initial(S.name)
-			use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
-		add_overlay("protolathe_[stack_name]")
-		addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
+			var/stack_name = stack.name
+			busy = TRUE
+			use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
+			to_chat(user, "<span class='notice'>You add [amount_inserted] sheets to the [src.name].</span>")
+			add_overlay("protolathe_[stack_name]")
+			sleep(10)
+			cut_overlay("protolathe_[stack_name]")
+			busy = FALSE
+		updateUsrDialog()
+
+	else if(istype(O, /obj/item/ore/bluespace_crystal)) //Bluespace crystals can be either a stack or an item
+		. = 1
+		if(!is_insertion_ready(user))
+			return
+		var/bs_material = materials.get_item_material_amount(O)
+		if(!bs_material)
+			return
+
+		if(!materials.has_space(bs_material))
+			to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
+			return 1
+
+		materials.insert_item(O)
+		busy = TRUE
+		use_power(MINERAL_MATERIAL_AMOUNT/10)
+		to_chat(user, "<span class='notice'>You add [O] to the [src.name].</span>")
+		qdel(O)
+		add_overlay("protolathe_bluespace")
+		sleep(10)
+		cut_overlay("protolathe_bluespace")
+		busy = FALSE
+		updateUsrDialog()
+
+	else if(user.a_intent != INTENT_HARM)
+		to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
+		return 1
+	else
+		return 0

code/modules/research/rdconsole.dm

@@ -169,15 +169,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	if(href_list["menu"]) //Switches menu screens. Converts a sent text string into a number. Saves a LOT of code.
 		var/temp_screen = text2num(href_list["menu"])
 		screen = temp_screen
-	
-	
-	var/datum/component/material_container/linked_materials
-	if(linked_lathe)
-		linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-	
-	var/datum/component/material_container/imprinter_materials
-	if(linked_imprinter)
-		imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
 
 	if(href_list["category"])
 		selected_category = href_list["category"]
@@ -324,7 +315,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 				if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
 					for(var/material in linked_destroy.loaded_item.materials)
-						linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
+						linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
 					SSblackbox.add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
 				linked_destroy.loaded_item = null
 				for(var/obj/I in linked_destroy.contents)
@@ -430,7 +421,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		for(var/MAT in being_built.materials)
 			efficient_mats[MAT] = being_built.materials[MAT]*coeff
 
-		if(!linked_materials.has_materials(efficient_mats, amount))
+		if(!linked_lathe.materials.has_materials(efficient_mats, amount))
 			linked_lathe.say("Not enough materials to complete prototype.")
 			enough_materials = 0
 			g2g = 0
@@ -442,7 +433,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					g2g = 0
 
 		if(enough_materials)
-			linked_materials.use_amount(efficient_mats, amount)
+			linked_lathe.materials.use_amount(efficient_mats, amount)
 			for(var/R in being_built.reagents_list)
 				linked_lathe.reagents.remove_reagent(R, being_built.reagents_list[R]*coeff)
 
@@ -506,7 +497,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		for(var/MAT in being_built.materials)
 			efficient_mats[MAT] = being_built.materials[MAT]/coeff
 
-		if(!imprinter_materials.has_materials(efficient_mats))
+		if(!linked_imprinter.materials.has_materials(efficient_mats))
 			linked_imprinter.say("Not enough materials to complete prototype.")
 			enough_materials = 0
 			g2g = 0
@@ -518,7 +509,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					g2g = 0
 
 		if(enough_materials)
-			imprinter_materials.use_amount(efficient_mats)
+			linked_imprinter.materials.use_amount(efficient_mats)
 			for(var/R in being_built.reagents_list)
 				linked_imprinter.reagents.remove_reagent(R, being_built.reagents_list[R]/coeff)
 
@@ -545,7 +536,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		linked_lathe.reagents.clear_reagents()
 
 	else if(href_list["ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
-		linked_materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["ejectsheet"])
+		linked_lathe.materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["ejectsheet"])
 
 	//Circuit Imprinter Materials
 	else if(href_list["disposeI"] && linked_imprinter)  //Causes the circuit imprinter to dispose of a single reagent (all of it)
@@ -555,7 +546,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		linked_imprinter.reagents.clear_reagents()
 
 	else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the imprinter to eject a sheet of material
-		imprinter_materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["imprinter_ejectsheet"])
+		linked_imprinter.materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["imprinter_ejectsheet"])
 
 
 	else if(href_list["find_device"]) //The R&D console looks for devices nearby to link up with.
@@ -643,14 +634,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(linked_imprinter == null)
 				screen = 4.0
 
-	
-	var/datum/component/material_container/linked_materials
-	if(linked_lathe)
-		linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-	
-	var/datum/component/material_container/imprinter_materials
-	if(linked_imprinter)
-		imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
 	switch(screen)
 
 		//////////////////////R&D CONSOLE SCREENS//////////////////
@@ -840,7 +823,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=3.2'>Material Storage</A>"
 			dat += "<A href='?src=\ref[src];menu=3.3'>Chemical Storage</A><div class='statusDisplay'>"
 			dat += "<h3>Protolathe Menu:</h3><BR>"
-			dat += "<B>Material Amount:</B> [linked_materials.total_amount] / [linked_materials.max_amount]<BR>"
+			dat += "<B>Material Amount:</B> [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]<BR>"
 			dat += "<B>Chemical Volume:</B> [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]<BR>"
 
 			dat += "<form name='search' action='?src=\ref[src]'>\
@@ -858,7 +841,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 			dat += "<A href='?src=\ref[src];menu=3.1'>Protolathe Menu</A>"
 			dat += "<div class='statusDisplay'><h3>Browsing [selected_category]:</h3><BR>"
-			dat += "<B>Material Amount:</B> [linked_materials.total_amount] / [linked_materials.max_amount]<BR>"
+			dat += "<B>Material Amount:</B> [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]<BR>"
 			dat += "<B>Chemical Volume:</B> [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]<HR>"
 
 			var/coeff = linked_lathe.efficiency_coeff
@@ -896,7 +879,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 			dat += "<A href='?src=\ref[src];menu=3.1'>Protolathe Menu</A>"
 			dat += "<div class='statusDisplay'><h3>Search results:</h3><BR>"
-			dat += "<B>Material Amount:</B> [linked_materials.total_amount] / [linked_materials.max_amount]<BR>"
+			dat += "<B>Material Amount:</B> [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]<BR>"
 			dat += "<B>Chemical Volume:</B> [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]<HR>"
 
 			var/coeff = linked_lathe.efficiency_coeff
@@ -933,8 +916,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(!linked_lathe)
 				dat += "ERROR: Protolathe connection failed."
 			else
-				for(var/mat_id in linked_materials.materials)
-					var/datum/material/M = linked_materials.materials[mat_id]
+				for(var/mat_id in linked_lathe.materials.materials)
+					var/datum/material/M = linked_lathe.materials.materials[mat_id]
 					dat += "* [M.amount] of [M.name]: "
 					if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];ejectsheet=[M.id];eject_amt=1'>Eject</A> "
 					if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];ejectsheet=[M.id];eject_amt=5'>5x</A> "
@@ -961,7 +944,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=4.3'>Material Storage</A>"
 			dat += "<A href='?src=\ref[src];menu=4.2'>Chemical Storage</A><div class='statusDisplay'>"
 			dat += "<h3>Circuit Imprinter Menu:</h3><BR>"
-			dat += "Material Amount: [imprinter_materials.total_amount]<BR>"
+			dat += "Material Amount: [linked_imprinter.materials.total_amount]<BR>"
 			dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]<HR>"
 
 			dat += "<form name='search' action='?src=\ref[src]'>\
@@ -978,7 +961,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 			dat += "<A href='?src=\ref[src];menu=4.1'>Circuit Imprinter Menu</A>"
 			dat += "<div class='statusDisplay'><h3>Browsing [selected_category]:</h3><BR>"
-			dat += "Material Amount: [imprinter_materials.total_amount]<BR>"
+			dat += "Material Amount: [linked_imprinter.materials.total_amount]<BR>"
 			dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]<HR>"
 
 			var/coeff = linked_imprinter.efficiency_coeff
@@ -1008,7 +991,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 			dat += "<A href='?src=\ref[src];menu=4.1'>Circuit Imprinter Menu</A>"
 			dat += "<div class='statusDisplay'><h3>Search results:</h3><BR>"
-			dat += "Material Amount: [imprinter_materials.total_amount]<BR>"
+			dat += "Material Amount: [linked_imprinter.materials.total_amount]<BR>"
 			dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]<HR>"
 
 			var/coeff = linked_imprinter.efficiency_coeff
@@ -1045,8 +1028,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(!linked_imprinter)
 				dat += "ERROR: Protolathe connection failed."
 			else
-				for(var/mat_id in imprinter_materials.materials)
-					var/datum/material/M = imprinter_materials.materials[mat_id]
+				for(var/mat_id in linked_imprinter.materials.materials)
+					var/datum/material/M = linked_imprinter.materials.materials[mat_id]
 					dat += "* [M.amount] of [M.name]: "
 					if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=[M.id];eject_amt=1'>Eject</A> "
 					if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=[M.id];eject_amt=5'>5x</A> "