diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-23 12:39:08 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-23 12:39:08 (GMT) |
| commit | 412e13a03edc7ee99f6f2c385479c562f9913bd7 (patch) | |
| tree | 88c708ffaffd92d60aed4c7fac9de9a4ea595a20 /src/simulation/elements/CRAY.cpp | |
| parent | da12cc6d46857bcc0534012de262fd0294b7ee69 (diff) | |
| parent | 07aade6c4c6de5384f1ad57a28592d0ac885e4c3 (diff) | |
| download | powder-412e13a03edc7ee99f6f2c385479c562f9913bd7.zip powder-412e13a03edc7ee99f6f2c385479c562f9913bd7.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements/CRAY.cpp')
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index eaf4a11..93c8db9 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 0; - Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp2"; + Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp"; State = ST_SOLID; Properties = TYPE_SOLID|PROP_LIFE_DEC; |