Merge pull request #9701 from Zuhayr/dev-freeze

Fixes #9597
This commit is contained in:
GinjaNinja32
2015-06-07 03:14:06 +01:00
3 changed files with 20 additions and 7 deletions
@@ -23,6 +23,15 @@
if(!material_key)
material_key = default_material
set_material(material_key)
if(!material)
qdel(src)
return
matter = material.get_matter()
if(matter.len)
for(var/material_type in matter)
if(!isnull(matter[material_type]))
matter[material_type] *= force_divisor // May require a new var instead.
/obj/item/weapon/material/proc/update_force()
if(edge || sharp)