Bay Merge 05NOV2014

Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.

code/modules/projectiles/ammunition.dm

@@ -51,7 +51,7 @@
 	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "syringe_kit"
-	m_amt = 50000
+	matter = list("metal" = 50000)
 	throwforce = 2
 	w_class = 2.0
 	throw_speed = 4

code/modules/projectiles/ammunition/boxes.dm

@@ -166,7 +166,7 @@
 	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/shotgun"
 	max_ammo = 8
-	m_amt = 100000
+	matter = list("metal" = 100000)
 /* no buckshots.  never again.  too hard to steal forever.
 /obj/item/ammo_magazine/shotgun/buck
 	name = "Ammunition Box (buckshot)"
@@ -177,17 +177,17 @@
 	name = "Ammunition Box (stun shells)"
 	ammo_type = "/obj/item/ammo_casing/shotgun/stunshell"
 	max_ammo = 8
-	m_amt = 20000
+	matter = list("metal" = 20000)
 
 /obj/item/ammo_magazine/shotgun/beanbag
 	name = "Ammunition Box (beanbag shells)"
 	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
 	max_ammo = 8
-	m_amt = 4000
+	matter = list("metal" = 4000)
 
 /obj/item/ammo_magazine/shotgun/incendiary
 	name = "Ammunition Box (incendiary shells)"
 	ammo_type = "/obj/item/ammo_casing/shotgun/incendiary"
 	max_ammo = 8
-	m_amt = 100000
+	matter = list("metal" = 100000)
 

code/modules/projectiles/ammunition/bullets.dm

@@ -65,14 +65,13 @@
 	icon_state = "gshell"
 	caliber = "shotgun"
 	projectile_type = "/obj/item/projectile/bullet"
-	m_amt = 12500
+	matter = list("metal" = 12500)
 
 /obj/item/ammo_casing/shotgun/incendiary
 	name = "shotgun shell"
 	desc = "A 12 gauge shell."
 	icon_state = "ishell"
 	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
-	m_amt = 12500
 
 
 /obj/item/ammo_casing/shotgun/blank
@@ -80,7 +79,7 @@
 	desc = "A blank shell."
 	icon_state = "blshell"
 	projectile_type = ""
-	m_amt = 250
+	matter = list("metal" = 250)
 
 
 /obj/item/ammo_casing/shotgun/beanbag
@@ -88,7 +87,7 @@
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
 	projectile_type = "/obj/item/projectile/bullet/weakbullet/beanbag"
-	m_amt = 500
+	matter = list("metal" = 500)
 
 
 /obj/item/ammo_casing/shotgun/stunshell
@@ -96,7 +95,7 @@
 	desc = "A stunning shell."
 	icon_state = "stunshell"
 	projectile_type = "/obj/item/projectile/bullet/stunshot"
-	m_amt = 2500
+	matter = list("metal" = 2500)
 
 
 /obj/item/ammo_casing/shotgun/dart
@@ -104,7 +103,7 @@
 	desc = "A dart for use in shotguns."
 	icon_state = "dart"
 	projectile_type = "/obj/item/projectile/energy/dart"
-	m_amt = 12500
+	matter = list("metal" = 12500)
 
 /obj/item/ammo_casing/a762
 	desc = "A 7.62 bullet casing."

code/modules/projectiles/gun.dm

@@ -6,7 +6,7 @@
 	item_state = "gun"
 	flags =  FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	w_class = 3.0
 	throwforce = 5
 	throw_speed = 4

code/modules/projectiles/guns/energy/erifles.dm

@@ -58,7 +58,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BACK
 	w_class = 4
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	charge_cost = 50 //odd numbers due to a requirement to have 20 shots. Easiest way.
 	origin_tech = "combat=3;magnets=2"
 	projectile_type = "/obj/item/projectile/beam"

code/modules/projectiles/guns/energy/laser.dm

@@ -6,7 +6,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BACK
 	w_class = 4
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	origin_tech = "combat=3;magnets=2"
 	projectile_type = "/obj/item/projectile/beam"
 

code/modules/projectiles/guns/energy/modular.dm

@@ -6,7 +6,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BACK
 	w_class = 4
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	origin_tech = "combat=3;magnets=2"
 	projectile_type = "/obj/item/projectile/beam/reallyweak"
 	fire_delay = 16

code/modules/projectiles/guns/energy/stun.dm

@@ -69,7 +69,7 @@
 	icon_state = "crossbow"
 	w_class = 2.0
 	item_state = "crossbow"
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	origin_tech = "combat=2;magnets=2;syndicate=5"
 	silenced = 1
 	fire_sound = 'sound/weapons/Genhit.ogg'
@@ -108,7 +108,7 @@
 	desc = "A weapon favored by syndicate infiltration teams."
 	w_class = 4.0
 	force = 10
-	m_amt = 200000
+	matter = list("metal" = 200000)
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
 
 

code/modules/projectiles/guns/projectile.dm

@@ -9,7 +9,7 @@
 	caliber = "357"
 	origin_tech = "combat=2;materials=2"
 	w_class = 3.0
-	m_amt = 1000
+	matter = list("metal" = 1000)
 	recoil = 1
 	var/ammo_type = "/obj/item/ammo_casing/a357"
 	var/list/loaded = list()