Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git

This commit is contained in:
jacob1 2013-05-19 22:59:42 -04:00
commit d29b001d82

View File

@ -28,7 +28,7 @@ Element_METL::Element_METL()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251; HeatConduct = 251;
Description = "The basic conductor, meltable and breaks under pressure."; Description = "The basic conductor. Meltable.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW; Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;