diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-20 02:59:42 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-20 02:59:42 (GMT) |
| commit | d29b001d82547e3c2f2e5ef4cf30b84ce59934b7 (patch) | |
| tree | ee5dc0104703a9d936b630bf76df8230690f2dd8 /src | |
| parent | 5b1389621fd58bdc281c854b62a1a9d027b7e9cb (diff) | |
| parent | 45f057957b6359190b6b2e150fddf926a525d070 (diff) | |
| download | powder-d29b001d82547e3c2f2e5ef4cf30b84ce59934b7.zip powder-d29b001d82547e3c2f2e5ef4cf30b84ce59934b7.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src')
| -rw-r--r-- | src/simulation/elements/METL.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp index d504e57..5b2c8fb 100644 --- a/src/simulation/elements/METL.cpp +++ b/src/simulation/elements/METL.cpp @@ -28,7 +28,7 @@ Element_METL::Element_METL() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 251; - Description = "The basic conductor, meltable and breaks under pressure."; + Description = "The basic conductor. Meltable."; State = ST_SOLID; Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW; |