cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #9597

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/material_sheets.dm
+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)
code/modules/materials/materials.dm
+10
View File
@@ -104,6 +104,16 @@ var/list/name_to_material
/material/proc/get_blunt_damage()
return weight //todo
// Return the matter comprising this material.
/material/proc/get_matter()
var/list/temp_matter = list()
if(islist(composite_material))
for(var/material_string in composite_material)
temp_matter[material_string] = composite_material[material_string]
else if(stack_per_sheet)
temp_matter[name] = stack_per_sheet
return temp_matter
// As above.
/material/proc/get_edge_damage()
return hardness //todo