Skip to content

Commit

Permalink
A few description updates from boxmein. Closes #282
Browse files Browse the repository at this point in the history
I don't think we need to add the element name for elements like ACID in the description when it is already obvious
  • Loading branch information
jacob1 committed Jun 11, 2016
1 parent 0af4b54 commit 337a929
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/simulation/elements/BTRY.cpp
Expand Up @@ -28,7 +28,7 @@ Element_BTRY::Element_BTRY()

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
Description = "Generates infinite electricity.";
Description = "Battery. Generates infinite electricity.";

Properties = TYPE_SOLID;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/CLNE.cpp
Expand Up @@ -28,7 +28,7 @@ Element_CLNE::Element_CLNE()

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
Description = "Solid. Duplicates any particles it touches.";
Description = "Clone. Duplicates any particles it touches.";

Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/CONV.cpp
Expand Up @@ -28,7 +28,7 @@ Element_CONV::Element_CONV()

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
Description = "Solid. Converts everything into whatever it first touches.";
Description = "Converter. Converts everything into whatever it first touches.";

Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/GAS.cpp
Expand Up @@ -28,7 +28,7 @@ Element_GAS::Element_GAS()

Temperature = R_TEMP+2.0f +273.15f;
HeatConduct = 42;
Description = "Diffuses quickly and flammable. Liquefies into OIL under pressure.";
Description = "Diffuses quickly and is flammable. Liquefies into OIL under pressure.";

Properties = TYPE_GAS | PROP_NEUTPASS;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/PLUT.cpp
Expand Up @@ -28,7 +28,7 @@ Element_PLUT::Element_PLUT()

Temperature = R_TEMP+4.0f +273.15f;
HeatConduct = 251;
Description = "Heavy particles. Fissile. Generates neutrons under pressure.";
Description = "Plutonium. Heavy, fissle particles. Generates neutrons under pressure.";

Properties = TYPE_PART|PROP_NEUTPASS|PROP_RADIOACTIVE;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/STOR.cpp
Expand Up @@ -28,7 +28,7 @@ Element_STOR::Element_STOR()

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
Description = "Captures and stores a single particle. releases when charged with PSCN, also passes to PIPE.";
Description = "Storage. Captures and stores a single particle. Releases when charged with PSCN, also passes to PIPE.";

Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/URAN.cpp
Expand Up @@ -28,7 +28,7 @@ Element_URAN::Element_URAN()

Temperature = R_TEMP+30.0f+273.15f;
HeatConduct = 251;
Description = "Heavy particles. Generates heat under pressure.";
Description = "Uranium. Heavy particles. Generates heat under pressure.";

Properties = TYPE_PART | PROP_RADIOACTIVE;

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/WATR.cpp
Expand Up @@ -28,7 +28,7 @@ Element_WATR::Element_WATR()

Temperature = R_TEMP-2.0f +273.15f;
HeatConduct = 29;
Description = "Conducts electricity, freezes, and extinguishes fires.";
Description = "Water. Conducts electricity, freezes, and extinguishes fires.";

Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS;

Expand Down

0 comments on commit 337a929

Please sign in to comment.