This commit is contained in:
Neerti
2017-03-14 08:04:29 -04:00
parent e526a4cdc7
commit 88d62cffdb
5 changed files with 112 additions and 0 deletions
+7
View File
@@ -94,6 +94,7 @@ var/list/name_to_material
var/reflectivity = 0 // How reflective to light is the material? Currently used for laser defense.
var/explosion_resistance = 5 // Only used by walls currently.
var/conductive = 1 // Objects with this var add CONDUCTS to flags on spawn.
var/conductivity = null // How conductive the material is. Based somewhat on megasiemens / metre at 20c
var/list/composite_material // If set, object matter var will be a list containing these values.
// Placeholder vars for the time being, todo properly integrate windows/light tiles/rods.
@@ -247,6 +248,7 @@ var/list/name_to_material
icon_colour = "#EDD12F"
weight = 24
hardness = 40
conductivity = 41
stack_origin_tech = list(TECH_MATERIAL = 4)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
@@ -261,6 +263,7 @@ var/list/name_to_material
icon_colour = "#D1E6E3"
weight = 22
hardness = 50
conductivity = 63
stack_origin_tech = list(TECH_MATERIAL = 3)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
@@ -320,6 +323,7 @@ var/list/name_to_material
name = DEFAULT_WALL_MATERIAL
stack_type = /obj/item/stack/material/steel
integrity = 150
conductivity = 6.99 // Assuming this is carbon steel
icon_base = "solid"
icon_reinf = "reinf_over"
icon_colour = "#666666"
@@ -377,6 +381,7 @@ var/list/name_to_material
/material/plasteel/titanium
name = "titanium"
stack_type = null
conductivity = 2.38
icon_base = "metal"
door_icon_base = "metal"
icon_colour = "#D1E6E3"
@@ -562,6 +567,7 @@ var/list/name_to_material
stack_type = /obj/item/stack/material/platinum
icon_colour = "#9999FF"
weight = 27
conductivity = 9.43
stack_origin_tech = list(TECH_MATERIAL = 2)
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
@@ -571,6 +577,7 @@ var/list/name_to_material
stack_type = /obj/item/stack/material/iron
icon_colour = "#5C5454"
weight = 22
conductivity = 10
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"