Remove .State property from all element files

src/simulation/Elements.h

@@ -39,11 +39,6 @@
 #define FLAG_PHOTDECO  0x8 // compatibility with old saves (decorated photons), only applies to PHOT. Having the same value as FLAG_MOVABLE is fine because they apply to different elements, and this saves space for future flags,
 
 
-#define ST_NONE 0
-#define ST_SOLID 1
-#define ST_LIQUID 2
-#define ST_GAS 3
-
 #define UPDATE_FUNC_ARGS Simulation* sim, int i, int x, int y, int surround_space, int nt, Particle *parts, int pmap[YRES][XRES]
 #define UPDATE_FUNC_SUBCALL_ARGS sim, i, x, y, surround_space, nt, parts, pmap
 

src/simulation/elements/116.cpp

@@ -30,7 +30,7 @@ Element_116::Element_116()
 	HeatConduct = 70;
 	Description = "A failed shared velocity test.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/146.cpp

@@ -30,7 +30,7 @@ Element_146::Element_146()
 	HeatConduct = 40;
 	Description = "Brian 6 S6/B246/3";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE;
 	
 	LowPressure = IPL;

src/simulation/elements/ACEL.cpp

@@ -30,7 +30,7 @@ Element_ACEL::Element_ACEL()
 	HeatConduct = 251;
 	Description = "Accelerator, speeds up nearby elements.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/ACID.cpp

@@ -30,7 +30,7 @@ Element_ACID::Element_ACID()
 	HeatConduct = 34;
 	Description = "Dissolves almost everything.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_DEADLY;
 	
 	LowPressure = IPL;

src/simulation/elements/AMTR.cpp

@@ -30,7 +30,7 @@ Element_AMTR::Element_AMTR()
 	HeatConduct = 70;
 	Description = "Anti-Matter, destroys a majority of particles.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;

src/simulation/elements/ANAR.cpp

@@ -30,7 +30,7 @@ Element_ANAR::Element_ANAR()
 	HeatConduct = 70;
 	Description = "Anti-air. Very light dust, which behaves opposite gravity.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/ARAY.cpp

@@ -30,7 +30,7 @@ Element_ARAY::Element_ARAY()
 	HeatConduct = 0;
 	Description = "Ray Emitter. Rays create points when they collide.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/BANG.cpp

@@ -30,7 +30,7 @@ Element_BANG::Element_BANG()
 	HeatConduct = 88;
 	Description = "TNT, explodes all at once.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;

src/simulation/elements/BCLN.cpp

@@ -30,7 +30,7 @@ Element_BCLN::Element_BCLN()
 	HeatConduct = 251;
 	Description = "Breakable Clone.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;

src/simulation/elements/BCOL.cpp

@@ -30,7 +30,7 @@ Element_BCOL::Element_BCOL()
 	HeatConduct = 150;
 	Description = "Broken Coal. Heavy particles, burns slowly.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/BGLA.cpp

@@ -30,7 +30,7 @@ Element_BGLA::Element_BGLA()
 	HeatConduct = 150;
 	Description = "Broken Glass, heavy particles formed when glass breaks under pressure. Meltable. Bagels.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART | PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/BHOL.cpp

@@ -30,7 +30,7 @@ Element_BHOL::Element_BHOL()
 	HeatConduct = 255;
 	Description = "Vacuum, sucks in other particles and heats up.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/BIZR.cpp

@@ -30,7 +30,7 @@ Element_BIZR::Element_BIZR()
 	HeatConduct = 29;
 	Description = "Bizarre... contradicts the normal state changes. Paints other elements with its deco color.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;

src/simulation/elements/BIZRG.cpp

@@ -30,7 +30,7 @@ Element_BIZRG::Element_BIZRG()
 	HeatConduct = 42;
 	Description = "Bizarre gas.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;

src/simulation/elements/BIZRS.cpp

@@ -30,7 +30,7 @@ Element_BIZRS::Element_BIZRS()
 	HeatConduct = 251;
 	Description = "Bizarre solid.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/BMTL.cpp

@@ -30,7 +30,7 @@ Element_BMTL::Element_BMTL()
 	HeatConduct = 251;
 	Description = "Breakable metal. Common conductive building material, can melt and break under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/BOMB.cpp

@@ -30,7 +30,7 @@ Element_BOMB::Element_BOMB()
 	HeatConduct = 29;
 	Description = "Bomb. Explodes and destroys all surrounding particles when it touches something.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
 	
 	LowPressure = IPL;

src/simulation/elements/BOYL.cpp

@@ -30,7 +30,7 @@ Element_BOYL::Element_BOYL()
 	HeatConduct = 42;
 	Description = "Boyle, variable pressure gas. Expands when heated.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;

src/simulation/elements/BRAY.cpp

@@ -30,7 +30,7 @@ Element_BRAY::Element_BRAY()
 	HeatConduct = 251;
 	Description = "Ray Point. Rays create points when they collide.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;

src/simulation/elements/BRCK.cpp

@@ -30,7 +30,7 @@ Element_BRCK::Element_BRCK()
 	HeatConduct = 251;
 	Description = "Brick, breakable building material.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/BREC.cpp

@@ -30,7 +30,7 @@ Element_BREC::Element_BREC()
 	HeatConduct = 211;
 	Description = "Broken electronics. Formed from EMP blasts, and when constantly sparked while under pressure, turns to EXOT.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/BRMT.cpp

@@ -30,7 +30,7 @@ Element_BRMT::Element_BRMT()
 	HeatConduct = 211;
 	Description = "Broken metal. Created when iron rusts or when when metals break from pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/BTRY.cpp

@@ -30,7 +30,7 @@ Element_BTRY::Element_BTRY()
 	HeatConduct = 251;
 	Description = "Generates infinite electricity.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/BVBR.cpp

@@ -30,7 +30,7 @@ Element_BVBR::Element_BVBR()
 	HeatConduct = 164;
 	Description = "Broken vibranium.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/C5.cpp

@@ -30,7 +30,7 @@ Element_C5::Element_C5()
 	HeatConduct = 88;
 	Description = "Cold explosive, set off by anything cold.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;

src/simulation/elements/CAUS.cpp

@@ -30,7 +30,7 @@ Element_CAUS::Element_CAUS()
 	HeatConduct = 70;
 	Description = "Caustic Gas, acts like ACID.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_DEADLY;
 	
 	LowPressure = IPL;

src/simulation/elements/CBNW.cpp

@@ -30,7 +30,7 @@ Element_CBNW::Element_CBNW()
 	HeatConduct = 29;
 	Description = "Carbonated water. Slowly releases CO2.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;

src/simulation/elements/CFLM.cpp

@@ -35,7 +35,7 @@ Element_CFLM::Element_CFLM()
 	HeatConduct = 88;
 	Description = "Sub-zero flame.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;

src/simulation/elements/CLNE.cpp

@@ -30,7 +30,7 @@ Element_CLNE::Element_CLNE()
 	HeatConduct = 251;
 	Description = "Solid. Duplicates any particles it touches.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;

src/simulation/elements/CLST.cpp

@@ -30,7 +30,7 @@ Element_CLST::Element_CLST()
 	HeatConduct = 70;
 	Description = "Clay dust. Produces paste when mixed with water.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/CNCT.cpp

@@ -30,7 +30,7 @@ Element_CNCT::Element_CNCT()
 	HeatConduct = 100;
 	Description = "Concrete, stronger than stone.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/CO2.cpp

@@ -30,7 +30,7 @@ Element_CO2::Element_CO2()
 	HeatConduct = 88;
 	Description = "Carbon Dioxide. Heavy gas, drifts downwards. Carbonates water and turns to dry ice when cold.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;

src/simulation/elements/COAL.cpp

@@ -30,7 +30,7 @@ Element_COAL::Element_COAL()
 	HeatConduct = 200;
 	Description = "Coal, Burns very slowly. Gets red when hot.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/CONV.cpp

@@ -30,7 +30,7 @@ Element_CONV::Element_CONV()
 	HeatConduct = 251;
 	Description = "Solid. Converts everything into whatever it first touches.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;

src/simulation/elements/CRAY.cpp

@@ -30,7 +30,7 @@ Element_CRAY::Element_CRAY()
 	HeatConduct = 0;
 	Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, with a range set by tmp.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/CRMC.cpp

@@ -30,7 +30,7 @@ Element_CRMC::Element_CRMC()
 	HeatConduct = 35;
 	Description = "Ceramic. Gets stronger under pressure.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPASS;
 
 	LowPressure = IPL;

src/simulation/elements/DCEL.cpp

@@ -30,7 +30,7 @@ Element_DCEL::Element_DCEL()
 	HeatConduct = 251;
 	Description = "Decelerator, slows down nearby elements.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/DESL.cpp

@@ -30,7 +30,7 @@ Element_DESL::Element_DESL()
 	HeatConduct = 42;
 	Description = "Liquid diesel. Explodes under high pressure and temperatures.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;

src/simulation/elements/DEST.cpp

@@ -30,7 +30,7 @@ Element_DEST::Element_DEST()
 	HeatConduct = 150;
 	Description = "More destructive Bomb, can break through virtually anything.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/DEUT.cpp

@@ -30,7 +30,7 @@ Element_DEUT::Element_DEUT()
 	HeatConduct = 251;
 	Description = "Deuterium oxide. Volume changes with temp, radioactive with neutrons.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/DLAY.cpp

@@ -30,7 +30,7 @@ Element_DLAY::Element_DLAY()
 	HeatConduct = 0;
 	Description = "Conducts with temperature-dependent delay. (use HEAT/COOL).";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/DMG.cpp

@@ -30,7 +30,7 @@ Element_DMG::Element_DMG()
 	HeatConduct = 29;
 	Description = "Generates damaging pressure and breaks any elements it hits.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
 	
 	LowPressure = IPL;

src/simulation/elements/DMND.cpp

@@ -30,7 +30,7 @@ Element_DMND::Element_DMND()
 	HeatConduct = 186;
 	Description = "Diamond. Indestructible.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/DRAY.cpp

@@ -30,7 +30,7 @@ Element_DRAY::Element_DRAY()
 	HeatConduct = 0;
 	Description = "Duplicator ray. Replicates a line of particles in front of it.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/DRIC.cpp

@@ -30,7 +30,7 @@ Element_DRIC::Element_DRIC()
 	HeatConduct = 2;
 	Description = "Dry Ice, formed when CO2 is cooled.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/DSTW.cpp

@@ -30,7 +30,7 @@ Element_DSTW::Element_DSTW()
 	HeatConduct = 23;
 	Description = "Distilled water, does not conduct electricity.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/DTEC.cpp

@@ -30,7 +30,7 @@ Element_DTEC::Element_DTEC()
 	HeatConduct = 0;
 	Description = "Detector, creates a spark when something with its ctype is nearby.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/DUST.cpp

@@ -30,7 +30,7 @@ Element_DUST::Element_DUST()
 	HeatConduct = 70;
 	Description = "Very light dust. Flammable.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/DYST.cpp

@@ -30,7 +30,7 @@ Element_DYST::Element_DYST()
 	HeatConduct = 70;
 	Description = "Dead Yeast.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/ELEC.cpp

@@ -30,7 +30,7 @@ Element_ELEC::Element_ELEC()
 	HeatConduct = 251;
 	Description = "Electrons. Sparks electronics, reacts with NEUT and WATR.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/EMBR.cpp

@@ -30,7 +30,7 @@ Element_EMBR::Element_EMBR()
 	HeatConduct = 29;
 	Description = "Sparks. Formed by explosions.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL|PROP_SPARKSETTLE;
 	
 	LowPressure = IPL;

src/simulation/elements/EMP.cpp

@@ -30,7 +30,7 @@ Element_EMP::Element_EMP()
 	HeatConduct = 121;
 	Description = "Electromagnetic pulse. Breaks activated electronics.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/ETRD.cpp

@@ -30,7 +30,7 @@ Element_ETRD::Element_ETRD()
 	HeatConduct = 251;
 	Description = "Electrode. Creates a surface that allows Plasma arcs. (Use sparingly)";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/EXOT.cpp

@@ -30,7 +30,7 @@ Element_EXOT::Element_EXOT()
 	HeatConduct = 250;
 	Description = "Exotic matter. Explodes with excess exposure to electrons. Has many other odd reactions.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/Element.cpp

@@ -30,7 +30,6 @@ Element::Element():
 	HeatConduct(128),
 	Description("No description"),
 
-	State(ST_SOLID),
 	Properties(TYPE_SOLID),
 
 	LowPressure(IPL),
@@ -73,7 +72,7 @@ std::vector<StructProperty> Element::GetProperties()
 	properties.push_back(StructProperty("Temperature",					StructProperty::Float,		offsetof(Element, Temperature)));
 	properties.push_back(StructProperty("HeatConduct",					StructProperty::UChar,		offsetof(Element, HeatConduct)));
 	properties.push_back(StructProperty("Description",					StructProperty::String,		offsetof(Element, Description)));
-	properties.push_back(StructProperty("State",						StructProperty::Char,		offsetof(Element, State)));
+	//properties.push_back(StructProperty("State",						StructProperty::Char,		offsetof(Element, State)));
 	properties.push_back(StructProperty("Properties",					StructProperty::Integer,	offsetof(Element, Properties)));
 	properties.push_back(StructProperty("LowPressure",					StructProperty::Float,		offsetof(Element, LowPressure)));
 	properties.push_back(StructProperty("LowPressureTransition",		StructProperty::Integer,	offsetof(Element, LowPressureTransition)));

src/simulation/elements/Element.h

@@ -36,7 +36,6 @@ public:
 	float Temperature;
 	unsigned char HeatConduct;
 	const char *Description;
-	char State;
 	unsigned int Properties;
 	
 	float LowPressure;

src/simulation/elements/FIGH.cpp

@@ -30,7 +30,7 @@ Element_FIGH::Element_FIGH()
 	HeatConduct = 0;
 	Description = "Fighter. Tries to kill stickmen. You must first give it an element to kill him with.";
 	
-	State = ST_NONE;
+
 	Properties = PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;

src/simulation/elements/FILT.cpp

@@ -30,7 +30,7 @@ Element_FILT::Element_FILT()
 	HeatConduct = 251;
 	Description = "Filter for photons, changes the color.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NOAMBHEAT | PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FIRE.cpp

@@ -30,7 +30,7 @@ Element_FIRE::Element_FIRE()
 	HeatConduct = 88;
 	Description = "Ignites flammable materials. Heats air.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;

src/simulation/elements/FIRW.cpp

@@ -34,7 +34,7 @@ Element_FIRW::Element_FIRW()
 	HeatConduct = 70;
 	Description = "Fireworks! Colorful, set off by fire.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FOG.cpp

@@ -30,7 +30,7 @@ Element_FOG::Element_FOG()
 	HeatConduct = 100;
 	Description = "Fog, created when an electric current is passed through RIME.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FRAY.cpp

@@ -30,7 +30,7 @@ Element_FRAY::Element_FRAY()
 	HeatConduct = 0;
 	Description = "Force Emitter. Pushes or pulls objects based on its temperature. Use like ARAY.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FRME.cpp

@@ -30,7 +30,7 @@ Element_FRME::Element_FRME()
 	HeatConduct = 0;
 	Description = "Frame, can be used with pistons to push many particles.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FRZW.cpp

@@ -30,7 +30,7 @@ Element_FRZW::Element_FRZW()
 	HeatConduct = 29;
 	Description = "Freeze water. Hybrid liquid formed when Freeze powder melts.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID | PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/FRZZ.cpp

@@ -30,7 +30,7 @@ Element_FRZZ::Element_FRZZ()
 	HeatConduct = 46;
 	Description = "Freeze powder. When melted, forms ice that always cools. Spreads with regular water.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/FSEP.cpp

@@ -30,7 +30,7 @@ Element_FSEP::Element_FSEP()
 	HeatConduct = 70;
 	Description = "Fuse Powder. Burns slowly like FUSE.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/FUSE.cpp

@@ -30,7 +30,7 @@ Element_FUSE::Element_FUSE()
 	HeatConduct = 200;
 	Description = "Burns slowly. Ignites at somewhat high temperatures or with electricity.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/FWRK.cpp

@@ -30,7 +30,7 @@ Element_FWRK::Element_FWRK()
 	HeatConduct = 100;
 	Description = "Original version of fireworks, activated by heat/neutrons.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/GAS.cpp

@@ -30,7 +30,7 @@ Element_GAS::Element_GAS()
 	HeatConduct = 42;
 	Description = "Diffuses quickly and flammable. Liquefies into OIL under pressure.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS | PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/GBMB.cpp

@@ -30,7 +30,7 @@ Element_GBMB::Element_GBMB()
 	HeatConduct = 29;
 	Description = "Gravity bomb. Sticks to the first object it touches then produces a strong gravity push.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/GEL.cpp

@@ -30,7 +30,7 @@ Element_GEL::Element_GEL()
 	HeatConduct = 29;
 	Description = "Gel. A liquid with variable viscosity and heat conductivity.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;

src/simulation/elements/GLAS.cpp

@@ -30,7 +30,7 @@ Element_GLAS::Element_GLAS()
 	HeatConduct = 150;
 	Description = "Glass. Meltable. Shatters under pressure, and refracts photons.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPASS | PROP_HOT_GLOW | PROP_SPARKSETTLE;
 	
 	LowPressure = IPL;

src/simulation/elements/GLOW.cpp

@@ -30,7 +30,7 @@ Element_GLOW::Element_GLOW()
 	HeatConduct = 44;
 	Description = "Glow, Glows under pressure.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/GOLD.cpp

@@ -31,7 +31,7 @@ Element_GOLD::Element_GOLD()
 	HeatConduct = 251;
 	Description = "Corrosion resistant metal, will reverse corrosion of iron.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC|PROP_NEUTPASS;
 
 	LowPressure = IPL;

src/simulation/elements/GOO.cpp

@@ -30,7 +30,7 @@ Element_GOO::Element_GOO()
 	HeatConduct = 75;
 	Description = "Deforms and disappears under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/GPMP.cpp

@@ -30,7 +30,7 @@ Element_GPMP::Element_GPMP()
 	HeatConduct = 0;
 	Description = "Gravity pump. Changes gravity to its temp when activated. (use HEAT/COOL)";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/GRAV.cpp

@@ -30,7 +30,7 @@ Element_GRAV::Element_GRAV()
 	HeatConduct = 70;
 	Description = "Very light dust. Changes colour based on velocity.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/GRVT.cpp

@@ -30,7 +30,7 @@ Element_GRVT::Element_GRVT()
 	HeatConduct = 61;
 	Description = "Gravitons. Create Newtonian Gravity.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/GUNP.cpp

@@ -30,7 +30,7 @@ Element_GUNP::Element_GUNP()
 	HeatConduct = 97;
 	Description = "Gunpowder. Light dust, explodes on contact with fire or spark.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;

src/simulation/elements/H2.cpp

@@ -30,7 +30,7 @@ Element_H2::Element_H2()
 	HeatConduct = 251;
 	Description = "Hydrogen. Combusts with OXYG to make WATR. Undergoes fusion at high temperature and pressure.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;

src/simulation/elements/HSWC.cpp

@@ -30,7 +30,7 @@ Element_HSWC::Element_HSWC()
 	HeatConduct = 251;
 	Description = "Heat switch. Conducts heat only when activated.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/ICEI.cpp

@@ -30,7 +30,7 @@ Element_ICEI::Element_ICEI()
 	HeatConduct = 46;
 	Description = "Crushes under pressure. Cools down air.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/IGNT.cpp

@@ -30,7 +30,7 @@ Element_IGNT::Element_IGNT()
 	HeatConduct = 88;
 	Description = "Ignition cord. Burns slowly with fire and sparks.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE | PROP_SPARKSETTLE | PROP_LIFE_KILL;
 	
 	LowPressure = IPL;

src/simulation/elements/INSL.cpp

@@ -30,7 +30,7 @@ Element_INSL::Element_INSL()
 	HeatConduct = 0;
 	Description = "Insulator, does not conduct heat and blocks electricity.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/INST.cpp

@@ -30,7 +30,7 @@ Element_INST::Element_INST()
 	HeatConduct = 251;
 	Description = "Instantly conducts, PSCN to charge, NSCN to take.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/INVIS.cpp

@@ -30,7 +30,7 @@ Element_INVIS::Element_INVIS()
 	HeatConduct = 164;
 	Description = "Invisible to particles while under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPASS;
 	
 	LowPressure = IPL;

src/simulation/elements/INWR.cpp

@@ -30,7 +30,7 @@ Element_INWR::Element_INWR()
 	HeatConduct = 251;
 	Description = "Insulated Wire. Doesn't conduct to metal or semiconductors.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/IRON.cpp

@@ -30,7 +30,7 @@ Element_IRON::Element_IRON()
 	HeatConduct = 251;
 	Description = "Rusts with salt, can be used for electrolysis of WATR.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;

src/simulation/elements/ISOZ.cpp

@@ -30,7 +30,7 @@ Element_ISOZ::Element_ISOZ()
 	HeatConduct = 29;
 	Description = "Isotope-Z. Radioactive liquid, decays into photons when touching PHOT or under negative pressure.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;

src/simulation/elements/ISZS.cpp

@@ -30,7 +30,7 @@ Element_ISZS::Element_ISZS()
 	HeatConduct = 251;
 	Description = "Solid form of ISOZ, slowly decays into PHOT.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/LAVA.cpp

@@ -30,7 +30,7 @@ Element_LAVA::Element_LAVA()
 	HeatConduct = 60;
 	Description = "Molten lava. Ignites flammable materials. Generated when metals and other materials melt, solidifies when cold.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;

src/simulation/elements/LCRY.cpp

@@ -30,7 +30,7 @@ Element_LCRY::Element_LCRY()
 	HeatConduct = 251;
 	Description = "Liquid Crystal. Changes colour when charged. (PSCN Charges, NSCN Discharges)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/LIFE.cpp

@@ -34,7 +34,7 @@ Element_LIFE::Element_LIFE()
 	HeatConduct = 40;
 	Description = "Game Of Life! B3/S23";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE;
 	
 	LowPressure = IPL;

src/simulation/elements/LIGH.cpp

@@ -31,7 +31,7 @@ Element_LIGH::Element_LIGH()
 	HeatConduct = 0;
 	Description = "Lightning. Change the brush size to set the size of the lightning.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/LNTG.cpp

@@ -30,7 +30,7 @@ Element_LNTG::Element_LNTG()
 	HeatConduct = 70;
 	Description = "Liquid Nitrogen. Very cold, disappears whenever it touches anything warmer.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;

src/simulation/elements/LO2.cpp

@@ -30,7 +30,7 @@ Element_LO2::Element_LO2()
 	HeatConduct = 70;
 	Description = "Liquid Oxygen. Very cold. Reacts with fire.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;

src/simulation/elements/LOLZ.cpp

@@ -30,7 +30,7 @@ Element_LOLZ::Element_LOLZ()
 	HeatConduct = 40;
 	Description = "Lolz";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/LOVE.cpp

@@ -30,7 +30,7 @@ Element_LOVE::Element_LOVE()
 	HeatConduct = 40;
 	Description = "Love...";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;

src/simulation/elements/LRBD.cpp

@@ -30,7 +30,7 @@ Element_LRBD::Element_LRBD()
 	HeatConduct = 170;
 	Description = "Liquid Rubidium.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;