This commit is contained in:
Zuhayr
2015-06-06 11:20:56 +09:30
parent 2da0a5e979
commit f03fc826f1
3 changed files with 20 additions and 7 deletions
+1 -7
View File
@@ -38,13 +38,7 @@
if(material.conductive)
flags |= CONDUCT
if(!islist(matter))
matter = list()
if(material.composite_material)
for(var/material_string in material.composite_material)
matter[material_string] = material.composite_material[material_string]
else
matter[material.name] = material.stack_per_sheet
matter = material.get_matter()
return 1
/obj/item/stack/material/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)