Merge with dev.

code/game/objects/items/devices/debugger.dm

@@ -16,8 +16,9 @@
 	throw_range = 15
 	throw_speed = 3
 	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	m_amt = 50
-	g_amt = 20
+
+	matter = list("metal" = 50,"glass" = 20)
+
 	origin_tech = "magnets=1;engineering=1"
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 

code/game/objects/items/devices/flashlight.dm

@@ -7,8 +7,9 @@
 	w_class = 2
 	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
-	m_amt = 50
-	g_amt = 20
+
+	matter = list("metal" = 50,"glass" = 20)
+
 	icon_action_button = "action_flashlight"
 	var/on = 0
 	var/brightness_on = 4 //luminosity when on
@@ -128,8 +129,7 @@
 	brightness_on = 5
 	w_class = 4
 	flags = FPRINT | TABLEPASS | CONDUCT
-	m_amt = 0
-	g_amt = 0
+
 	on = 1
 
 
@@ -204,7 +204,7 @@
 		src.force = on_damage
 		src.damtype = "fire"
 		processing_objects += src
-		
+
 /obj/item/device/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"
@@ -213,16 +213,14 @@
 	icon_state = "floor1" //not a slime extract sprite but... something close enough!
 	item_state = "slime"
 	w_class = 1
-	m_amt = 0
-	g_amt = 0
 	brightness_on = 6
 	on = 1 //Bio-luminesence has one setting, on.
-	
+
 /obj/item/device/flashlight/slime/New()
 	SetLuminosity(brightness_on)
 	spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me!
 		update_brightness()
 		icon_state = initial(icon_state)
-	
+
 /obj/item/device/flashlight/slime/attack_self(mob/user)
 	return //Bio-luminescence does not toggle.

code/game/objects/items/devices/multitool.dm

@@ -15,7 +15,8 @@
 	throw_range = 15
 	throw_speed = 3
 	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	m_amt = 50
-	g_amt = 20
+
+	matter = list("metal" = 50,"glass" = 20)
+
 	origin_tech = "magnets=1;engineering=1"
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage

code/game/objects/items/devices/powersink.dm

@@ -10,8 +10,9 @@
 	throwforce = 5
 	throw_speed = 1
 	throw_range = 2
-	m_amt = 750
-	w_amt = 750
+
+	matter = list("metal" = 750,"waste" = 750)
+
 	origin_tech = "powerstorage=3;syndicate=5"
 	var/drain_rate = 600000		// amount of power to drain per tick
 	var/power_drained = 0 		// has drained this much power

code/game/objects/items/devices/radio/electropack.dm

@@ -7,8 +7,9 @@
 	flags = FPRINT | CONDUCT | TABLEPASS
 	slot_flags = SLOT_BACK
 	w_class = 5.0
-	g_amt = 2500
-	m_amt = 10000
+
+	matter = list("metal" = 10000,"glass" = 2500)
+
 	var/code = 2
 
 /obj/item/device/radio/electropack/attack_hand(mob/user as mob)

code/game/objects/items/devices/radio/headset.dm

@@ -3,8 +3,7 @@
 	desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
 	icon_state = "headset"
 	item_state = "headset"
-	g_amt = 0
-	m_amt = 75
+	matter = list("metal" = 75)
 	subspace_transmission = 1
 	canhear_range = 0 // can't hear headsets from very far away
 

code/game/objects/items/devices/radio/radio.dm

@@ -30,8 +30,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2
-	g_amt = 25
-	m_amt = 75
+
+	matter = list("glass" = 25,"metal" = 75)
+
 	var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
 	var/const/WIRE_RECEIVE = 2
 	var/const/WIRE_TRANSMIT = 4
@@ -761,10 +762,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 				continue
 			src.channels += ch_name
 			src.channels[ch_name] += keyslot.channels[ch_name]
-			
+
 		if(keyslot.syndie)
 			src.syndie = 1
-	
+
 
 	for (var/ch_name in src.channels)
 		if(!radio_controller)

code/game/objects/items/devices/scanners.dm

@@ -17,7 +17,9 @@ REAGENT SCANNER
 	slot_flags = SLOT_BELT
 	w_class = 2
 	item_state = "electronic"
-	m_amt = 150
+
+	matter = list("metal" = 150)
+
 	origin_tech = "magnets=1;engineering=1"
 
 /obj/item/device/t_scanner/attack_self(mob/user)
@@ -71,7 +73,7 @@ REAGENT SCANNER
 	w_class = 2.0
 	throw_speed = 5
 	throw_range = 10
-	m_amt = 200
+	matter = list("metal" = 200)
 	origin_tech = "magnets=1;biotech=1"
 	var/mode = 1;
 
@@ -209,8 +211,9 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+
+	matter = list("metal" = 30,"glass" = 20)
+
 	origin_tech = "magnets=1;engineering=1"
 
 /obj/item/device/analyzer/attack_self(mob/user as mob)
@@ -279,8 +282,9 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+
+	matter = list("metal" = 30,"glass" = 20)
+
 	origin_tech = "magnets=2;biotech=2"
 	var/details = 0
 	var/recent_fail = 0
@@ -352,8 +356,8 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+	matter = list("metal" = 30,"glass" = 20)
+
 	origin_tech = "magnets=2;biotech=2"
 	var/details = 0
 	var/recent_fail = 0

code/game/objects/items/devices/taperecorder.dm

@@ -4,8 +4,9 @@
 	icon_state = "taperecorderidle"
 	item_state = "analyzer"
 	w_class = 2.0
-	m_amt = 60
-	g_amt = 30
+
+	matter = list("metal" = 60,"glass" = 30)
+
 	var/emagged = 0.0
 	var/recording = 0.0
 	var/playing = 0.0