diff --git a/src/simulation/Elements.h b/src/simulation/Elements.h
index f00a3a6c3..9c383c264 100644
--- a/src/simulation/Elements.h
+++ b/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
 
diff --git a/src/simulation/elements/116.cpp b/src/simulation/elements/116.cpp
index 7e5255773..60039fa1f 100644
--- a/src/simulation/elements/116.cpp
+++ b/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;
diff --git a/src/simulation/elements/146.cpp b/src/simulation/elements/146.cpp
index df2b7bcf8..cc8c25118 100644
--- a/src/simulation/elements/146.cpp
+++ b/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;
diff --git a/src/simulation/elements/ACEL.cpp b/src/simulation/elements/ACEL.cpp
index ae69fedf0..e8684fbac 100644
--- a/src/simulation/elements/ACEL.cpp
+++ b/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;
diff --git a/src/simulation/elements/ACID.cpp b/src/simulation/elements/ACID.cpp
index ceeac1c6c..8c6461568 100644
--- a/src/simulation/elements/ACID.cpp
+++ b/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;
diff --git a/src/simulation/elements/AMTR.cpp b/src/simulation/elements/AMTR.cpp
index 6f8af0253..8d0f01f46 100644
--- a/src/simulation/elements/AMTR.cpp
+++ b/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;
diff --git a/src/simulation/elements/ANAR.cpp b/src/simulation/elements/ANAR.cpp
index 150c2ccef..443a3d610 100644
--- a/src/simulation/elements/ANAR.cpp
+++ b/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;
diff --git a/src/simulation/elements/ARAY.cpp b/src/simulation/elements/ARAY.cpp
index cb0e7ab08..f7dd0a135 100644
--- a/src/simulation/elements/ARAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/BANG.cpp b/src/simulation/elements/BANG.cpp
index 4dc4598d8..01bfd86a2 100644
--- a/src/simulation/elements/BANG.cpp
+++ b/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;
diff --git a/src/simulation/elements/BCLN.cpp b/src/simulation/elements/BCLN.cpp
index 2a5860980..9d6f17776 100644
--- a/src/simulation/elements/BCLN.cpp
+++ b/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;
diff --git a/src/simulation/elements/BCOL.cpp b/src/simulation/elements/BCOL.cpp
index cb53f6c38..d5bc51fc0 100644
--- a/src/simulation/elements/BCOL.cpp
+++ b/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;
diff --git a/src/simulation/elements/BGLA.cpp b/src/simulation/elements/BGLA.cpp
index e514c90a6..d8ce4df36 100644
--- a/src/simulation/elements/BGLA.cpp
+++ b/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;
diff --git a/src/simulation/elements/BHOL.cpp b/src/simulation/elements/BHOL.cpp
index 7fc73eced..b2081af56 100644
--- a/src/simulation/elements/BHOL.cpp
+++ b/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;
diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp
index 83a5375b2..6a74ee527 100644
--- a/src/simulation/elements/BIZR.cpp
+++ b/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;
diff --git a/src/simulation/elements/BIZRG.cpp b/src/simulation/elements/BIZRG.cpp
index aa1f0d213..aa9f789ed 100644
--- a/src/simulation/elements/BIZRG.cpp
+++ b/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;
diff --git a/src/simulation/elements/BIZRS.cpp b/src/simulation/elements/BIZRS.cpp
index e9d557f97..25ab434bf 100644
--- a/src/simulation/elements/BIZRS.cpp
+++ b/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;
diff --git a/src/simulation/elements/BMTL.cpp b/src/simulation/elements/BMTL.cpp
index ffd719606..d63c4dc48 100644
--- a/src/simulation/elements/BMTL.cpp
+++ b/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;
diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp
index 303ceb544..7057f91de 100644
--- a/src/simulation/elements/BOMB.cpp
+++ b/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;
diff --git a/src/simulation/elements/BOYL.cpp b/src/simulation/elements/BOYL.cpp
index 268f72907..89cc58695 100644
--- a/src/simulation/elements/BOYL.cpp
+++ b/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;
diff --git a/src/simulation/elements/BRAY.cpp b/src/simulation/elements/BRAY.cpp
index ed521bd9c..51dada16f 100644
--- a/src/simulation/elements/BRAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/BRCK.cpp b/src/simulation/elements/BRCK.cpp
index a3752078a..107e2e4e0 100644
--- a/src/simulation/elements/BRCK.cpp
+++ b/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;
diff --git a/src/simulation/elements/BREC.cpp b/src/simulation/elements/BREC.cpp
index 5c466908e..6dcc2c998 100644
--- a/src/simulation/elements/BREC.cpp
+++ b/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;
diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp
index b94961aa0..986f0ebe9 100644
--- a/src/simulation/elements/BRMT.cpp
+++ b/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;
diff --git a/src/simulation/elements/BTRY.cpp b/src/simulation/elements/BTRY.cpp
index 00fd42686..2752b319b 100644
--- a/src/simulation/elements/BTRY.cpp
+++ b/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;
diff --git a/src/simulation/elements/BVBR.cpp b/src/simulation/elements/BVBR.cpp
index 4e8678247..39f0c77a3 100644
--- a/src/simulation/elements/BVBR.cpp
+++ b/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;
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp
index 81bb64379..7e5da52df 100644
--- a/src/simulation/elements/C5.cpp
+++ b/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;
diff --git a/src/simulation/elements/CAUS.cpp b/src/simulation/elements/CAUS.cpp
index 1fa231e1d..9e6e6d2c2 100644
--- a/src/simulation/elements/CAUS.cpp
+++ b/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;
diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp
index cb1efc9d5..c75080b27 100644
--- a/src/simulation/elements/CBNW.cpp
+++ b/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;
diff --git a/src/simulation/elements/CFLM.cpp b/src/simulation/elements/CFLM.cpp
index 84ce1a989..4731a1466 100644
--- a/src/simulation/elements/CFLM.cpp
+++ b/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;
diff --git a/src/simulation/elements/CLNE.cpp b/src/simulation/elements/CLNE.cpp
index 04b0374d8..e2b5f4070 100644
--- a/src/simulation/elements/CLNE.cpp
+++ b/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;
diff --git a/src/simulation/elements/CLST.cpp b/src/simulation/elements/CLST.cpp
index 35162c18a..15a43d75c 100644
--- a/src/simulation/elements/CLST.cpp
+++ b/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;
diff --git a/src/simulation/elements/CNCT.cpp b/src/simulation/elements/CNCT.cpp
index 5734791fb..417bfc58e 100644
--- a/src/simulation/elements/CNCT.cpp
+++ b/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;
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp
index bafebb014..db1527bb9 100644
--- a/src/simulation/elements/CO2.cpp
+++ b/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;
diff --git a/src/simulation/elements/COAL.cpp b/src/simulation/elements/COAL.cpp
index d51dc3e1b..1ddedb2c9 100644
--- a/src/simulation/elements/COAL.cpp
+++ b/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;
diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp
index 39fadcc3f..054a34019 100644
--- a/src/simulation/elements/CONV.cpp
+++ b/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;
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index d379960b1..c1f0137b8 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/CRMC.cpp b/src/simulation/elements/CRMC.cpp
index 1e845ccc5..3a27d57a9 100644
--- a/src/simulation/elements/CRMC.cpp
+++ b/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;
diff --git a/src/simulation/elements/DCEL.cpp b/src/simulation/elements/DCEL.cpp
index 561a0a760..1e5cfd78e 100644
--- a/src/simulation/elements/DCEL.cpp
+++ b/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;
diff --git a/src/simulation/elements/DESL.cpp b/src/simulation/elements/DESL.cpp
index 53267f5a7..25a54e452 100644
--- a/src/simulation/elements/DESL.cpp
+++ b/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;
diff --git a/src/simulation/elements/DEST.cpp b/src/simulation/elements/DEST.cpp
index 70be801d5..13abb1af7 100644
--- a/src/simulation/elements/DEST.cpp
+++ b/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;
diff --git a/src/simulation/elements/DEUT.cpp b/src/simulation/elements/DEUT.cpp
index 63fdcd931..cdca13ded 100644
--- a/src/simulation/elements/DEUT.cpp
+++ b/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;
diff --git a/src/simulation/elements/DLAY.cpp b/src/simulation/elements/DLAY.cpp
index 89b75c632..05a5acdef 100644
--- a/src/simulation/elements/DLAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp
index 573f998f7..ea351945f 100644
--- a/src/simulation/elements/DMG.cpp
+++ b/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;
diff --git a/src/simulation/elements/DMND.cpp b/src/simulation/elements/DMND.cpp
index 9b86a840e..a8826f880 100644
--- a/src/simulation/elements/DMND.cpp
+++ b/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;
diff --git a/src/simulation/elements/DRAY.cpp b/src/simulation/elements/DRAY.cpp
index 06cbef1a7..9bf60864a 100644
--- a/src/simulation/elements/DRAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/DRIC.cpp b/src/simulation/elements/DRIC.cpp
index 8809fbbed..5c916a951 100644
--- a/src/simulation/elements/DRIC.cpp
+++ b/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;
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp
index 2264eba15..7f18f5748 100644
--- a/src/simulation/elements/DSTW.cpp
+++ b/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;
diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp
index 259dd2fd5..b82fdd353 100644
--- a/src/simulation/elements/DTEC.cpp
+++ b/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;
diff --git a/src/simulation/elements/DUST.cpp b/src/simulation/elements/DUST.cpp
index 5c807895d..b37fcbdba 100644
--- a/src/simulation/elements/DUST.cpp
+++ b/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;
diff --git a/src/simulation/elements/DYST.cpp b/src/simulation/elements/DYST.cpp
index 6a04158ac..63fea41f2 100644
--- a/src/simulation/elements/DYST.cpp
+++ b/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;
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp
index 593eb697f..09f8b2398 100644
--- a/src/simulation/elements/ELEC.cpp
+++ b/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;
diff --git a/src/simulation/elements/EMBR.cpp b/src/simulation/elements/EMBR.cpp
index 3ef94d9f6..55d77c5b8 100644
--- a/src/simulation/elements/EMBR.cpp
+++ b/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;
diff --git a/src/simulation/elements/EMP.cpp b/src/simulation/elements/EMP.cpp
index b511d993b..bd069306d 100644
--- a/src/simulation/elements/EMP.cpp
+++ b/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;
diff --git a/src/simulation/elements/ETRD.cpp b/src/simulation/elements/ETRD.cpp
index 72825ab58..a26ee0f2c 100644
--- a/src/simulation/elements/ETRD.cpp
+++ b/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;
diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp
index 9972087b2..e47bacd21 100644
--- a/src/simulation/elements/EXOT.cpp
+++ b/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;
diff --git a/src/simulation/elements/Element.cpp b/src/simulation/elements/Element.cpp
index 28471c350..6ab808c2f 100644
--- a/src/simulation/elements/Element.cpp
+++ b/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)));
diff --git a/src/simulation/elements/Element.h b/src/simulation/elements/Element.h
index c4a3112b9..dfbda0a30 100644
--- a/src/simulation/elements/Element.h
+++ b/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;
diff --git a/src/simulation/elements/FIGH.cpp b/src/simulation/elements/FIGH.cpp
index 52911800d..e2d3c02f6 100644
--- a/src/simulation/elements/FIGH.cpp
+++ b/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;
diff --git a/src/simulation/elements/FILT.cpp b/src/simulation/elements/FILT.cpp
index be0672845..94e9b11da 100644
--- a/src/simulation/elements/FILT.cpp
+++ b/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;
diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp
index 5543e0410..0d7a26bb8 100644
--- a/src/simulation/elements/FIRE.cpp
+++ b/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;
diff --git a/src/simulation/elements/FIRW.cpp b/src/simulation/elements/FIRW.cpp
index a090dd3cd..b735e9338 100644
--- a/src/simulation/elements/FIRW.cpp
+++ b/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;
diff --git a/src/simulation/elements/FOG.cpp b/src/simulation/elements/FOG.cpp
index acede2324..a36794fc5 100644
--- a/src/simulation/elements/FOG.cpp
+++ b/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;
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp
index c20e1a30e..68716a872 100644
--- a/src/simulation/elements/FRAY.cpp
+++ b/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;
diff --git a/src/simulation/elements/FRME.cpp b/src/simulation/elements/FRME.cpp
index 138226515..40c447d27 100644
--- a/src/simulation/elements/FRME.cpp
+++ b/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;
diff --git a/src/simulation/elements/FRZW.cpp b/src/simulation/elements/FRZW.cpp
index eed4ae6ef..e4d21070e 100644
--- a/src/simulation/elements/FRZW.cpp
+++ b/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;
diff --git a/src/simulation/elements/FRZZ.cpp b/src/simulation/elements/FRZZ.cpp
index 7995e81b1..7002e4a1a 100644
--- a/src/simulation/elements/FRZZ.cpp
+++ b/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;
diff --git a/src/simulation/elements/FSEP.cpp b/src/simulation/elements/FSEP.cpp
index 9e945ee31..de1104cc8 100644
--- a/src/simulation/elements/FSEP.cpp
+++ b/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;
diff --git a/src/simulation/elements/FUSE.cpp b/src/simulation/elements/FUSE.cpp
index abc84334d..8c1dbe5bb 100644
--- a/src/simulation/elements/FUSE.cpp
+++ b/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;
diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp
index 63ffbc9bc..64e8d5743 100644
--- a/src/simulation/elements/FWRK.cpp
+++ b/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;
diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp
index f7190f858..ea5e5d265 100644
--- a/src/simulation/elements/GAS.cpp
+++ b/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;
diff --git a/src/simulation/elements/GBMB.cpp b/src/simulation/elements/GBMB.cpp
index 3fbe5f2aa..5721aecac 100644
--- a/src/simulation/elements/GBMB.cpp
+++ b/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;
diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp
index 8f6a18e30..f95d5327c 100644
--- a/src/simulation/elements/GEL.cpp
+++ b/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;
diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp
index f0e861692..c66f7eb21 100644
--- a/src/simulation/elements/GLAS.cpp
+++ b/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;
diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp
index b46606923..62358796d 100644
--- a/src/simulation/elements/GLOW.cpp
+++ b/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;
diff --git a/src/simulation/elements/GOLD.cpp b/src/simulation/elements/GOLD.cpp
index 984a82ed5..9e749ac94 100644
--- a/src/simulation/elements/GOLD.cpp
+++ b/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;
diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp
index 6ee3dddaa..b6cf11508 100644
--- a/src/simulation/elements/GOO.cpp
+++ b/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;
diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp
index 970f79777..8cfb0dd93 100644
--- a/src/simulation/elements/GPMP.cpp
+++ b/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;
diff --git a/src/simulation/elements/GRAV.cpp b/src/simulation/elements/GRAV.cpp
index 649344c70..18602b76d 100644
--- a/src/simulation/elements/GRAV.cpp
+++ b/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;
diff --git a/src/simulation/elements/GRVT.cpp b/src/simulation/elements/GRVT.cpp
index 263794924..e163a4ba6 100644
--- a/src/simulation/elements/GRVT.cpp
+++ b/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;
diff --git a/src/simulation/elements/GUNP.cpp b/src/simulation/elements/GUNP.cpp
index 625feeb68..b01f0704f 100644
--- a/src/simulation/elements/GUNP.cpp
+++ b/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;
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index bc1031e39..94bd1d416 100644
--- a/src/simulation/elements/H2.cpp
+++ b/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;
diff --git a/src/simulation/elements/HSWC.cpp b/src/simulation/elements/HSWC.cpp
index ab7fcb331..e5a0eb739 100644
--- a/src/simulation/elements/HSWC.cpp
+++ b/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;
diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp
index fd77d1cae..323f68867 100644
--- a/src/simulation/elements/ICEI.cpp
+++ b/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;
diff --git a/src/simulation/elements/IGNT.cpp b/src/simulation/elements/IGNT.cpp
index 500d1a1d8..06b9a3f04 100644
--- a/src/simulation/elements/IGNT.cpp
+++ b/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;
diff --git a/src/simulation/elements/INSL.cpp b/src/simulation/elements/INSL.cpp
index 7fe5dffec..d8eb05a7b 100644
--- a/src/simulation/elements/INSL.cpp
+++ b/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;
diff --git a/src/simulation/elements/INST.cpp b/src/simulation/elements/INST.cpp
index 834001109..3cb2dbefa 100644
--- a/src/simulation/elements/INST.cpp
+++ b/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;
diff --git a/src/simulation/elements/INVIS.cpp b/src/simulation/elements/INVIS.cpp
index e73c9bfb0..00f8166b8 100644
--- a/src/simulation/elements/INVIS.cpp
+++ b/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;
diff --git a/src/simulation/elements/INWR.cpp b/src/simulation/elements/INWR.cpp
index 03563041e..94ac83751 100644
--- a/src/simulation/elements/INWR.cpp
+++ b/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;
diff --git a/src/simulation/elements/IRON.cpp b/src/simulation/elements/IRON.cpp
index 1757c1f05..c1cea3cc3 100644
--- a/src/simulation/elements/IRON.cpp
+++ b/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;
diff --git a/src/simulation/elements/ISOZ.cpp b/src/simulation/elements/ISOZ.cpp
index 9f01495a6..4ca799fd2 100644
--- a/src/simulation/elements/ISOZ.cpp
+++ b/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;
diff --git a/src/simulation/elements/ISZS.cpp b/src/simulation/elements/ISZS.cpp
index df9c022e7..6c27eebe2 100644
--- a/src/simulation/elements/ISZS.cpp
+++ b/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;
diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp
index e617071ef..b1d1a6b4b 100644
--- a/src/simulation/elements/LAVA.cpp
+++ b/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;
diff --git a/src/simulation/elements/LCRY.cpp b/src/simulation/elements/LCRY.cpp
index eddd705af..ef6553380 100644
--- a/src/simulation/elements/LCRY.cpp
+++ b/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;
diff --git a/src/simulation/elements/LIFE.cpp b/src/simulation/elements/LIFE.cpp
index 26cbcda57..89651e015 100644
--- a/src/simulation/elements/LIFE.cpp
+++ b/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;
diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp
index b25f20cae..02277f113 100644
--- a/src/simulation/elements/LIGH.cpp
+++ b/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;
diff --git a/src/simulation/elements/LNTG.cpp b/src/simulation/elements/LNTG.cpp
index 8b6e29a70..9e5782cfd 100644
--- a/src/simulation/elements/LNTG.cpp
+++ b/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;
diff --git a/src/simulation/elements/LO2.cpp b/src/simulation/elements/LO2.cpp
index abf08a408..d681ee9f3 100644
--- a/src/simulation/elements/LO2.cpp
+++ b/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;
diff --git a/src/simulation/elements/LOLZ.cpp b/src/simulation/elements/LOLZ.cpp
index 90172118b..62156523a 100644
--- a/src/simulation/elements/LOLZ.cpp
+++ b/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;
diff --git a/src/simulation/elements/LOVE.cpp b/src/simulation/elements/LOVE.cpp
index f34663525..e55158fc5 100644
--- a/src/simulation/elements/LOVE.cpp
+++ b/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;
diff --git a/src/simulation/elements/LRBD.cpp b/src/simulation/elements/LRBD.cpp
index 1b40fd3ee..0b37d190a 100644
--- a/src/simulation/elements/LRBD.cpp
+++ b/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;
diff --git a/src/simulation/elements/MERC.cpp b/src/simulation/elements/MERC.cpp
index ce74df171..b77a11f4d 100644
--- a/src/simulation/elements/MERC.cpp
+++ b/src/simulation/elements/MERC.cpp
@@ -30,7 +30,7 @@ Element_MERC::Element_MERC()
 	HeatConduct = 251;
 	Description = "Mercury. Volume changes with temperature, Conductive.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_NEUTABSORB|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp
index 5b2c8fb06..f22c65545 100644
--- a/src/simulation/elements/METL.cpp
+++ b/src/simulation/elements/METL.cpp
@@ -30,7 +30,7 @@ Element_METL::Element_METL()
 	HeatConduct = 251;
 	Description = "The basic conductor. Meltable.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/MORT.cpp b/src/simulation/elements/MORT.cpp
index b34b11bf0..205b105e6 100644
--- a/src/simulation/elements/MORT.cpp
+++ b/src/simulation/elements/MORT.cpp
@@ -30,7 +30,7 @@ Element_MORT::Element_MORT()
 	HeatConduct = 60;
 	Description = "Steam Train.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/MWAX.cpp b/src/simulation/elements/MWAX.cpp
index 0a750132a..d70e5d6a3 100644
--- a/src/simulation/elements/MWAX.cpp
+++ b/src/simulation/elements/MWAX.cpp
@@ -30,7 +30,7 @@ Element_MWAX::Element_MWAX()
 	HeatConduct = 44;
 	Description = "Liquid Wax. Hardens into WAX at 45 degrees.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NBHL.cpp b/src/simulation/elements/NBHL.cpp
index 425be810c..e9980b4ef 100644
--- a/src/simulation/elements/NBHL.cpp
+++ b/src/simulation/elements/NBHL.cpp
@@ -30,7 +30,7 @@ Element_NBHL::Element_NBHL()
 	HeatConduct = 186;
 	Description = "Black hole, sucks in particles using gravity. (Requires Newtonian gravity)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NBLE.cpp b/src/simulation/elements/NBLE.cpp
index 89b1f42b6..6e5d87e56 100644
--- a/src/simulation/elements/NBLE.cpp
+++ b/src/simulation/elements/NBLE.cpp
@@ -30,7 +30,7 @@ Element_NBLE::Element_NBLE()
 	HeatConduct = 106;
 	Description = "Noble Gas. Diffuses and conductive. Ionizes into plasma when introduced to electricity.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NEUT.cpp b/src/simulation/elements/NEUT.cpp
index d1c5dc2b1..718d2183f 100644
--- a/src/simulation/elements/NEUT.cpp
+++ b/src/simulation/elements/NEUT.cpp
@@ -30,7 +30,7 @@ Element_NEUT::Element_NEUT()
 	HeatConduct = 60;
 	Description = "Neutrons. Interact with matter in odd ways.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NICE.cpp b/src/simulation/elements/NICE.cpp
index bd87de93c..d15656eef 100644
--- a/src/simulation/elements/NICE.cpp
+++ b/src/simulation/elements/NICE.cpp
@@ -30,7 +30,7 @@ Element_NICE::Element_NICE()
 	HeatConduct = 46;
 	Description = "Nitrogen Ice. Very cold, will melt into LN2 when heated only slightly.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NITR.cpp b/src/simulation/elements/NITR.cpp
index c61d2d19b..987272dee 100644
--- a/src/simulation/elements/NITR.cpp
+++ b/src/simulation/elements/NITR.cpp
@@ -30,7 +30,7 @@ Element_NITR::Element_NITR()
 	HeatConduct = 50;
 	Description = "Nitroglycerin. Pressure sensitive explosive. Mix with CLST to make TNT.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NONE.cpp b/src/simulation/elements/NONE.cpp
index 2fdb261de..6cbdbe220 100644
--- a/src/simulation/elements/NONE.cpp
+++ b/src/simulation/elements/NONE.cpp
@@ -30,7 +30,7 @@ Element_NONE::Element_NONE()
 	HeatConduct = 0;
 	Description = "Erases particles.";
 	
-	State = ST_NONE;
+
 	Properties = 0;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NSCN.cpp b/src/simulation/elements/NSCN.cpp
index 36d0a066b..0c276ea77 100644
--- a/src/simulation/elements/NSCN.cpp
+++ b/src/simulation/elements/NSCN.cpp
@@ -30,7 +30,7 @@ Element_NSCN::Element_NSCN()
 	HeatConduct = 251;
 	Description = "N-Type Silicon, Will not transfer current to P-Type Silicon.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NTCT.cpp b/src/simulation/elements/NTCT.cpp
index 7aa296902..cbf8890fc 100644
--- a/src/simulation/elements/NTCT.cpp
+++ b/src/simulation/elements/NTCT.cpp
@@ -30,7 +30,7 @@ Element_NTCT::Element_NTCT()
 	HeatConduct = 251;
 	Description = "Semi-conductor. Only conducts electricity when hot. (More than 100C)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/NWHL.cpp b/src/simulation/elements/NWHL.cpp
index ed39c56cf..1c7974aeb 100644
--- a/src/simulation/elements/NWHL.cpp
+++ b/src/simulation/elements/NWHL.cpp
@@ -30,7 +30,7 @@ Element_NWHL::Element_NWHL()
 	HeatConduct = 186;
 	Description = "White hole, pushes away other particles with gravity. (Requires Newtonian gravity)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp
index 1d38054f6..cf13961b2 100644
--- a/src/simulation/elements/O2.cpp
+++ b/src/simulation/elements/O2.cpp
@@ -30,7 +30,7 @@ Element_O2::Element_O2()
 	HeatConduct = 70;
 	Description = "Oxygen gas. Ignites easily.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/OIL.cpp b/src/simulation/elements/OIL.cpp
index d78660e13..53a98f3f6 100644
--- a/src/simulation/elements/OIL.cpp
+++ b/src/simulation/elements/OIL.cpp
@@ -30,7 +30,7 @@ Element_OIL::Element_OIL()
 	HeatConduct = 42;
 	Description = "Flammable, turns into GAS at low pressure or high temperature. Can be formed with NEUT and NITR.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID | PROP_NEUTPASS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PBCN.cpp b/src/simulation/elements/PBCN.cpp
index 6d61c9dd2..81f2b0265 100644
--- a/src/simulation/elements/PBCN.cpp
+++ b/src/simulation/elements/PBCN.cpp
@@ -30,7 +30,7 @@ Element_PBCN::Element_PBCN()
 	HeatConduct = 251;
 	Description = "Powered breakable clone.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PCLN.cpp b/src/simulation/elements/PCLN.cpp
index 26b096085..d9c1ee1fe 100644
--- a/src/simulation/elements/PCLN.cpp
+++ b/src/simulation/elements/PCLN.cpp
@@ -30,7 +30,7 @@ Element_PCLN::Element_PCLN()
 	HeatConduct = 251;
 	Description = "Powered clone. When activated, duplicates any particles it touches.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PHOT.cpp b/src/simulation/elements/PHOT.cpp
index 91305d2df..0f24452d3 100644
--- a/src/simulation/elements/PHOT.cpp
+++ b/src/simulation/elements/PHOT.cpp
@@ -30,7 +30,7 @@ Element_PHOT::Element_PHOT()
 	HeatConduct = 251;
 	Description = "Photons. Refracts through glass, scattered by quartz, and color-changed by different elements. Ignites flammable materials.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp
index 86f15d60e..7aa4d4739 100644
--- a/src/simulation/elements/PIPE.cpp
+++ b/src/simulation/elements/PIPE.cpp
@@ -33,7 +33,7 @@ Element_PIPE::Element_PIPE()
 	HeatConduct = 0;
 	Description = "PIPE, moves particles around. Once the BRCK generates, erase some for the exit. Then the PIPE generates and is usable.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PLEX.cpp b/src/simulation/elements/PLEX.cpp
index 2b8c867a3..c0e5dfdc5 100644
--- a/src/simulation/elements/PLEX.cpp
+++ b/src/simulation/elements/PLEX.cpp
@@ -30,7 +30,7 @@ Element_PLEX::Element_PLEX()
 	HeatConduct = 88;
 	Description = "Solid pressure sensitive explosive.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp
index 4d23247fe..8a2ad3b3d 100644
--- a/src/simulation/elements/PLNT.cpp
+++ b/src/simulation/elements/PLNT.cpp
@@ -30,7 +30,7 @@ Element_PLNT::Element_PLNT()
 	HeatConduct = 65;
 	Description = "Plant, drinks water and grows.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_NEUTPENETRATE|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PLSM.cpp b/src/simulation/elements/PLSM.cpp
index a9e5728f0..77db81b91 100644
--- a/src/simulation/elements/PLSM.cpp
+++ b/src/simulation/elements/PLSM.cpp
@@ -30,7 +30,7 @@ Element_PLSM::Element_PLSM()
 	HeatConduct = 5;
 	Description = "Plasma, extremely hot.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PLUT.cpp b/src/simulation/elements/PLUT.cpp
index 424735713..f74860430 100644
--- a/src/simulation/elements/PLUT.cpp
+++ b/src/simulation/elements/PLUT.cpp
@@ -30,7 +30,7 @@ Element_PLUT::Element_PLUT()
 	HeatConduct = 251;
 	Description = "Heavy particles. Fissile. Generates neutrons under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_NEUTPASS|PROP_RADIOACTIVE;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PPIP.cpp b/src/simulation/elements/PPIP.cpp
index a5948d3a3..4b56857e5 100644
--- a/src/simulation/elements/PPIP.cpp
+++ b/src/simulation/elements/PPIP.cpp
@@ -30,7 +30,7 @@ Element_PPIP::Element_PPIP()
 	HeatConduct = 0;
 	Description = "Powered version of PIPE, use PSCN/NSCN to Activate/Deactivate.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PQRT.cpp b/src/simulation/elements/PQRT.cpp
index 5510c7ae1..cc6e92264 100644
--- a/src/simulation/elements/PQRT.cpp
+++ b/src/simulation/elements/PQRT.cpp
@@ -30,7 +30,7 @@ Element_PQRT::Element_PQRT()
 	HeatConduct = 3;
 	Description = "Powdered quartz, broken form of QRTZ.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART| PROP_HOT_GLOW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PROT.cpp b/src/simulation/elements/PROT.cpp
index 15604833f..7c8a1a926 100644
--- a/src/simulation/elements/PROT.cpp
+++ b/src/simulation/elements/PROT.cpp
@@ -30,7 +30,7 @@ Element_PROT::Element_PROT()
 	HeatConduct = 61;
 	Description = "Protons. Transfer heat to materials, and removes sparks.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_ENERGY;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PRTI.cpp b/src/simulation/elements/PRTI.cpp
index 1da828a92..c4d5bd883 100644
--- a/src/simulation/elements/PRTI.cpp
+++ b/src/simulation/elements/PRTI.cpp
@@ -30,7 +30,7 @@ Element_PRTI::Element_PRTI()
 	HeatConduct = 0;
 	Description = "Portal IN. Particles go in here. Also has temperature dependent channels. (same as WIFI)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PRTO.cpp b/src/simulation/elements/PRTO.cpp
index 1eae7ce92..a9e60491a 100644
--- a/src/simulation/elements/PRTO.cpp
+++ b/src/simulation/elements/PRTO.cpp
@@ -30,7 +30,7 @@ Element_PRTO::Element_PRTO()
 	HeatConduct = 0;
 	Description = "Portal OUT. Particles come out here. Also has temperature dependent channels. (same as WIFI)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PSCN.cpp b/src/simulation/elements/PSCN.cpp
index 8e0a3d4b4..0b9648a8b 100644
--- a/src/simulation/elements/PSCN.cpp
+++ b/src/simulation/elements/PSCN.cpp
@@ -30,7 +30,7 @@ Element_PSCN::Element_PSCN()
 	HeatConduct = 251;
 	Description = "P-Type Silicon, Will transfer current to any conductor.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PSNS.cpp b/src/simulation/elements/PSNS.cpp
index 1ab8de35c..3a55a5e80 100644
--- a/src/simulation/elements/PSNS.cpp
+++ b/src/simulation/elements/PSNS.cpp
@@ -30,7 +30,7 @@ Element_PSNS::Element_PSNS()
 	HeatConduct = 0;
 	Description = "Pressure sensor, creates a spark when the pressure is greater than its temperature.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PSTE.cpp b/src/simulation/elements/PSTE.cpp
index 0857bff48..69972391e 100644
--- a/src/simulation/elements/PSTE.cpp
+++ b/src/simulation/elements/PSTE.cpp
@@ -30,7 +30,7 @@ Element_PSTE::Element_PSTE()
 	HeatConduct = 29;
 	Description = "Colloid, Hardens under pressure.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index 3c7a473b8..e5048a096 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -30,7 +30,7 @@ Element_PSTN::Element_PSTN()
 	HeatConduct = 0;
 	Description = "Piston, extends and pushes particles.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PSTS.cpp b/src/simulation/elements/PSTS.cpp
index e309ed1a0..b100e5e25 100644
--- a/src/simulation/elements/PSTS.cpp
+++ b/src/simulation/elements/PSTS.cpp
@@ -30,7 +30,7 @@ Element_PSTS::Element_PSTS()
 	HeatConduct = 29;
 	Description = "Solid form of PSTE.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = 0.5f;
diff --git a/src/simulation/elements/PTCT.cpp b/src/simulation/elements/PTCT.cpp
index 89262088f..0fad71240 100644
--- a/src/simulation/elements/PTCT.cpp
+++ b/src/simulation/elements/PTCT.cpp
@@ -30,7 +30,7 @@ Element_PTCT::Element_PTCT()
 	HeatConduct = 251;
 	Description = "Semi-conductor. Only conducts electricity when cold. (Less than 100C)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PUMP.cpp b/src/simulation/elements/PUMP.cpp
index 1f9086fdf..d72542fd7 100644
--- a/src/simulation/elements/PUMP.cpp
+++ b/src/simulation/elements/PUMP.cpp
@@ -30,7 +30,7 @@ Element_PUMP::Element_PUMP()
 	HeatConduct = 0;
 	Description = "Pressure pump. Changes pressure to its temp when activated. (use HEAT/COOL).";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/PVOD.cpp b/src/simulation/elements/PVOD.cpp
index 0c08584e0..597be5f48 100644
--- a/src/simulation/elements/PVOD.cpp
+++ b/src/simulation/elements/PVOD.cpp
@@ -30,7 +30,7 @@ Element_PVOD::Element_PVOD()
 	HeatConduct = 251;
 	Description = "Powered VOID. When activated, destroys entering particles.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/QRTZ.cpp b/src/simulation/elements/QRTZ.cpp
index e850a5810..ff6000d1c 100644
--- a/src/simulation/elements/QRTZ.cpp
+++ b/src/simulation/elements/QRTZ.cpp
@@ -30,7 +30,7 @@ Element_QRTZ::Element_QRTZ()
 	HeatConduct = 3;
 	Description = "Quartz, breakable mineral. Conducts but becomes brittle at lower temperatures.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_HOT_GLOW|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/RBDM.cpp b/src/simulation/elements/RBDM.cpp
index b1aed8553..c9632002a 100644
--- a/src/simulation/elements/RBDM.cpp
+++ b/src/simulation/elements/RBDM.cpp
@@ -30,7 +30,7 @@ Element_RBDM::Element_RBDM()
 	HeatConduct = 240;
 	Description = "Rubidium. Explosive, especially on contact with water. Low melting point.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/RIME.cpp b/src/simulation/elements/RIME.cpp
index deef4c252..472a083a1 100644
--- a/src/simulation/elements/RIME.cpp
+++ b/src/simulation/elements/RIME.cpp
@@ -30,7 +30,7 @@ Element_RIME::Element_RIME()
 	HeatConduct = 100;
 	Description = "Solid, created when steam cools rapidly and goes through sublimation.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/RPEL.cpp b/src/simulation/elements/RPEL.cpp
index 70e38830e..ad7aebc88 100644
--- a/src/simulation/elements/RPEL.cpp
+++ b/src/simulation/elements/RPEL.cpp
@@ -30,7 +30,7 @@ Element_RPEL::Element_RPEL()
 	HeatConduct = 0;
 	Description = "Repels or attracts particles based on its temperature.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SALT.cpp b/src/simulation/elements/SALT.cpp
index 6772c2b39..e5c8d9d71 100644
--- a/src/simulation/elements/SALT.cpp
+++ b/src/simulation/elements/SALT.cpp
@@ -30,7 +30,7 @@ Element_SALT::Element_SALT()
 	HeatConduct = 110;
 	Description = "Salt, dissolves in water.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SAND.cpp b/src/simulation/elements/SAND.cpp
index 3a99e0e15..03d0a89a9 100644
--- a/src/simulation/elements/SAND.cpp
+++ b/src/simulation/elements/SAND.cpp
@@ -30,7 +30,7 @@ Element_SAND::Element_SAND()
 	HeatConduct = 150;
 	Description = "Sand, Heavy particles. Melts into glass.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SHLD1.cpp b/src/simulation/elements/SHLD1.cpp
index db06febc1..0f9de0e65 100644
--- a/src/simulation/elements/SHLD1.cpp
+++ b/src/simulation/elements/SHLD1.cpp
@@ -30,7 +30,7 @@ Element_SHLD1::Element_SHLD1()
 	HeatConduct = 0;
 	Description = "Shield, spark it to grow.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SHLD2.cpp b/src/simulation/elements/SHLD2.cpp
index 26e66ab4f..79b277946 100644
--- a/src/simulation/elements/SHLD2.cpp
+++ b/src/simulation/elements/SHLD2.cpp
@@ -30,7 +30,7 @@ Element_SHLD2::Element_SHLD2()
 	HeatConduct = 0;
 	Description = "Shield lvl 2.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SHLD3.cpp b/src/simulation/elements/SHLD3.cpp
index ceb390fea..6db3125e2 100644
--- a/src/simulation/elements/SHLD3.cpp
+++ b/src/simulation/elements/SHLD3.cpp
@@ -30,7 +30,7 @@ Element_SHLD3::Element_SHLD3()
 	HeatConduct = 0;
 	Description = "Shield lvl 3.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SHLD4.cpp b/src/simulation/elements/SHLD4.cpp
index 199eb1328..6f4a4d19a 100644
--- a/src/simulation/elements/SHLD4.cpp
+++ b/src/simulation/elements/SHLD4.cpp
@@ -30,7 +30,7 @@ Element_SHLD4::Element_SHLD4()
 	HeatConduct = 0;
 	Description = "Shield lvl 4.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SING.cpp b/src/simulation/elements/SING.cpp
index 71305c5f3..7341a8ef9 100644
--- a/src/simulation/elements/SING.cpp
+++ b/src/simulation/elements/SING.cpp
@@ -30,7 +30,7 @@ Element_SING::Element_SING()
 	HeatConduct = 70;
 	Description = "Singularity. Creates huge amounts of negative pressure and destroys everything.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SLTW.cpp b/src/simulation/elements/SLTW.cpp
index 75757509b..039b99a05 100644
--- a/src/simulation/elements/SLTW.cpp
+++ b/src/simulation/elements/SLTW.cpp
@@ -30,7 +30,7 @@ Element_SLTW::Element_SLTW()
 	HeatConduct = 75;
 	Description = "Saltwater, conducts electricity, difficult to freeze.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SMKE.cpp b/src/simulation/elements/SMKE.cpp
index 4a993a30a..f0157c7d6 100644
--- a/src/simulation/elements/SMKE.cpp
+++ b/src/simulation/elements/SMKE.cpp
@@ -30,7 +30,7 @@ Element_SMKE::Element_SMKE()
 	HeatConduct = 88;
 	Description = "Smoke, created by fire.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp
index a5f468617..65a5b21bf 100644
--- a/src/simulation/elements/SNOW.cpp
+++ b/src/simulation/elements/SNOW.cpp
@@ -30,7 +30,7 @@ Element_SNOW::Element_SNOW()
 	HeatConduct = 46;
 	Description = "Light particles. Created when ICE breaks under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index 284484dcc..1da25ec43 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/src/simulation/elements/SOAP.cpp
@@ -30,7 +30,7 @@ Element_SOAP::Element_SOAP()
 	HeatConduct = 29;
 	Description = "Soap. Creates bubbles, washes off deco color, and cures virus.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPENETRATE|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp
index 9598b4dac..f21fc9437 100644
--- a/src/simulation/elements/SPAWN.cpp
+++ b/src/simulation/elements/SPAWN.cpp
@@ -30,7 +30,7 @@ Element_SPAWN::Element_SPAWN()
 	HeatConduct = 0;
 	Description = "STKM spawn point.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp
index eece19f5c..263486a28 100644
--- a/src/simulation/elements/SPAWN2.cpp
+++ b/src/simulation/elements/SPAWN2.cpp
@@ -30,7 +30,7 @@ Element_SPAWN2::Element_SPAWN2()
 	HeatConduct = 0;
 	Description = "STK2 spawn point.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SPNG.cpp b/src/simulation/elements/SPNG.cpp
index 47a3b7733..dc3a1d322 100644
--- a/src/simulation/elements/SPNG.cpp
+++ b/src/simulation/elements/SPNG.cpp
@@ -30,7 +30,7 @@ Element_SPNG::Element_SPNG()
 	HeatConduct = 251;
 	Description = "Sponge, absorbs water. Is not a moving solid.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp
index b5308e8d8..a1c8042fc 100644
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@@ -30,7 +30,7 @@ Element_SPRK::Element_SPRK()
 	HeatConduct = 251;
 	Description = "Electricity. The basis of all electronics in TPT, travels along wires and other conductive elements.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 5e4a08c27..dbf9d46fc 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -30,7 +30,7 @@ Element_STKM::Element_STKM()
 	HeatConduct = 0;
 	Description = "Stickman. Don't kill him! Control with the arrow keys.";
 	
-	State = ST_NONE;
+
 	Properties = PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp
index d9c3d9a83..78f446c99 100644
--- a/src/simulation/elements/STKM2.cpp
+++ b/src/simulation/elements/STKM2.cpp
@@ -30,7 +30,7 @@ Element_STKM2::Element_STKM2()
 	HeatConduct = 0;
 	Description = "Second stickman. Don't kill him! Control with wasd.";
 	
-	State = ST_NONE;
+
 	Properties = PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/STNE.cpp b/src/simulation/elements/STNE.cpp
index c0354db65..de24b1e20 100644
--- a/src/simulation/elements/STNE.cpp
+++ b/src/simulation/elements/STNE.cpp
@@ -30,7 +30,7 @@ Element_STNE::Element_STNE()
 	HeatConduct = 150;
 	Description = "Heavy particles. Meltable.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp
index 85a0193b1..faa94ae29 100644
--- a/src/simulation/elements/STOR.cpp
+++ b/src/simulation/elements/STOR.cpp
@@ -30,7 +30,7 @@ Element_STOR::Element_STOR()
 	HeatConduct = 0;
 	Description = "Captures and stores a single particle. releases when charged with PSCN, also passes to PIPE.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/SWCH.cpp b/src/simulation/elements/SWCH.cpp
index 893ce9e0e..7cac4b0f9 100644
--- a/src/simulation/elements/SWCH.cpp
+++ b/src/simulation/elements/SWCH.cpp
@@ -30,7 +30,7 @@ Element_SWCH::Element_SWCH()
 	HeatConduct = 251;
 	Description = "Only conducts when switched on. (PSCN switches on, NSCN switches off)";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/TESC.cpp b/src/simulation/elements/TESC.cpp
index 00ae1514b..9193c6e9b 100644
--- a/src/simulation/elements/TESC.cpp
+++ b/src/simulation/elements/TESC.cpp
@@ -30,7 +30,7 @@ Element_TESC::Element_TESC()
 	HeatConduct = 251;
 	Description = "Tesla coil! Creates lightning when sparked.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/THDR.cpp b/src/simulation/elements/THDR.cpp
index ba9e32c99..4fd5a3edd 100644
--- a/src/simulation/elements/THDR.cpp
+++ b/src/simulation/elements/THDR.cpp
@@ -30,7 +30,7 @@ Element_THDR::Element_THDR()
 	HeatConduct = 1;
 	Description = "Lightning! Very hot, inflicts damage upon most materials, and transfers current to metals.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_ENERGY;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/THRM.cpp b/src/simulation/elements/THRM.cpp
index 69e8e3ca2..b38933df7 100644
--- a/src/simulation/elements/THRM.cpp
+++ b/src/simulation/elements/THRM.cpp
@@ -30,7 +30,7 @@ Element_THRM::Element_THRM()
 	HeatConduct = 211;
 	Description = "Thermite. Burns at extremely high temperature.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/TRON.cpp b/src/simulation/elements/TRON.cpp
index 8b591dd0f..6064b602a 100644
--- a/src/simulation/elements/TRON.cpp
+++ b/src/simulation/elements/TRON.cpp
@@ -30,7 +30,7 @@ Element_TRON::Element_TRON()
 	HeatConduct = 40;
 	Description = "Smart particles, Travels in straight lines and avoids obstacles. Grows with time.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp
index 7bb72d18c..1d4810c31 100644
--- a/src/simulation/elements/TSNS.cpp
+++ b/src/simulation/elements/TSNS.cpp
@@ -30,7 +30,7 @@ Element_TSNS::Element_TSNS()
 	HeatConduct = 0;
 	Description = "Temperature sensor, creates a spark when there's a nearby particle with a greater temperature.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/TTAN.cpp b/src/simulation/elements/TTAN.cpp
index 248aba2a9..f1eafffeb 100644
--- a/src/simulation/elements/TTAN.cpp
+++ b/src/simulation/elements/TTAN.cpp
@@ -31,7 +31,7 @@ Element_TTAN::Element_TTAN()
 	HeatConduct = 251;
 	Description = "Titanium. Higher melting temperature than most other metals, blocks all air pressure.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC;
 
 	LowPressure = IPL;
diff --git a/src/simulation/elements/TUNG.cpp b/src/simulation/elements/TUNG.cpp
index bb27d9bbc..62116e084 100644
--- a/src/simulation/elements/TUNG.cpp
+++ b/src/simulation/elements/TUNG.cpp
@@ -31,7 +31,7 @@ Element_TUNG::Element_TUNG()
 	HeatConduct = 251;
 	Description = "Tungsten. Brittle metal with a very high melting point.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
 
 	LowPressure = IPL;
diff --git a/src/simulation/elements/URAN.cpp b/src/simulation/elements/URAN.cpp
index 69c02cc9c..9e8551a2f 100644
--- a/src/simulation/elements/URAN.cpp
+++ b/src/simulation/elements/URAN.cpp
@@ -30,7 +30,7 @@ Element_URAN::Element_URAN()
 	HeatConduct = 251;
 	Description = "Heavy particles. Generates heat under pressure.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART | PROP_RADIOACTIVE;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp
index e639c0453..b5263666e 100644
--- a/src/simulation/elements/VIBR.cpp
+++ b/src/simulation/elements/VIBR.cpp
@@ -30,7 +30,7 @@ Element_VIBR::Element_VIBR()
 	HeatConduct = 251;
 	Description = "Vibranium. Stores energy and releases it in violent explosions.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VINE.cpp b/src/simulation/elements/VINE.cpp
index 551b6ae50..a08c2e86e 100644
--- a/src/simulation/elements/VINE.cpp
+++ b/src/simulation/elements/VINE.cpp
@@ -30,7 +30,7 @@ Element_VINE::Element_VINE()
 	HeatConduct = 65;
 	Description = "Vine, can grow along WOOD.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VIRS.cpp b/src/simulation/elements/VIRS.cpp
index 90776d958..daed143b2 100644
--- a/src/simulation/elements/VIRS.cpp
+++ b/src/simulation/elements/VIRS.cpp
@@ -30,7 +30,7 @@ Element_VIRS::Element_VIRS()
 	HeatConduct = 251;
 	Description = "Virus. Turns everything it touches into virus.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_DEADLY;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VOID.cpp b/src/simulation/elements/VOID.cpp
index ee9517976..30e413388 100644
--- a/src/simulation/elements/VOID.cpp
+++ b/src/simulation/elements/VOID.cpp
@@ -30,7 +30,7 @@ Element_VOID::Element_VOID()
 	HeatConduct = 251;
 	Description = "Hole, will drain away any particles.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VRSG.cpp b/src/simulation/elements/VRSG.cpp
index 76fba4422..505c17033 100644
--- a/src/simulation/elements/VRSG.cpp
+++ b/src/simulation/elements/VRSG.cpp
@@ -30,7 +30,7 @@ Element_VRSG::Element_VRSG()
 	HeatConduct = 251;
 	Description = "Gas Virus. Turns everything it touches into virus.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_DEADLY;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/VRSS.cpp b/src/simulation/elements/VRSS.cpp
index 3bfb52901..15a5c68eb 100644
--- a/src/simulation/elements/VRSS.cpp
+++ b/src/simulation/elements/VRSS.cpp
@@ -30,7 +30,7 @@ Element_VRSS::Element_VRSS()
 	HeatConduct = 251;
 	Description = "Solid Virus. Turns everything it touches into virus.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_DEADLY;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp
index 88fc24cc9..9044a6343 100644
--- a/src/simulation/elements/WARP.cpp
+++ b/src/simulation/elements/WARP.cpp
@@ -30,7 +30,7 @@ Element_WARP::Element_WARP()
 	HeatConduct = 100;
 	Description = "Displaces other elements.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index 17289e0b4..f5c04e5a9 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -30,7 +30,7 @@ Element_WATR::Element_WATR()
 	HeatConduct = 29;
 	Description = "Conducts electricity, freezes, and extinguishes fires.";
 	
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WAX.cpp b/src/simulation/elements/WAX.cpp
index 187322288..28d4ae852 100644
--- a/src/simulation/elements/WAX.cpp
+++ b/src/simulation/elements/WAX.cpp
@@ -30,7 +30,7 @@ Element_WAX::Element_WAX()
 	HeatConduct = 44;
 	Description = "Wax. Melts at moderately high temperatures.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WHOL.cpp b/src/simulation/elements/WHOL.cpp
index 41a34bba7..201a6adc6 100644
--- a/src/simulation/elements/WHOL.cpp
+++ b/src/simulation/elements/WHOL.cpp
@@ -30,7 +30,7 @@ Element_WHOL::Element_WHOL()
 	HeatConduct = 255;
 	Description = "Air vent, creates pressure and pushes other particles away.";
 	
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WIFI.cpp b/src/simulation/elements/WIFI.cpp
index 1d30bdfb3..4504d89d1 100644
--- a/src/simulation/elements/WIFI.cpp
+++ b/src/simulation/elements/WIFI.cpp
@@ -30,7 +30,7 @@ Element_WIFI::Element_WIFI()
 	HeatConduct = 0;
 	Description = "Wireless transmitter, transfers spark to any other wifi on the same temperature channel.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp
index 89681bafd..adf2e9e0c 100644
--- a/src/simulation/elements/WIRE.cpp
+++ b/src/simulation/elements/WIRE.cpp
@@ -30,7 +30,7 @@ Element_WIRE::Element_WIRE()
 	HeatConduct = 250;
 	Description = "WireWorld wires, conducts based on a set of GOL-like rules.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index 467679003..034108d9a 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -30,7 +30,7 @@ Element_WOOD::Element_WOOD()
 	HeatConduct = 164;
 	Description = "Wood, flammable.";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/WTRV.cpp b/src/simulation/elements/WTRV.cpp
index 73b0808ca..83ac4ae82 100644
--- a/src/simulation/elements/WTRV.cpp
+++ b/src/simulation/elements/WTRV.cpp
@@ -30,7 +30,7 @@ Element_WTRV::Element_WTRV()
 	HeatConduct = 48;
 	Description = "Steam. Produced from hot water.";
 	
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 	
 	LowPressure = IPL;
diff --git a/src/simulation/elements/YEST.cpp b/src/simulation/elements/YEST.cpp
index 3987cd6c5..070d7ae23 100644
--- a/src/simulation/elements/YEST.cpp
+++ b/src/simulation/elements/YEST.cpp
@@ -30,7 +30,7 @@ Element_YEST::Element_YEST()
 	HeatConduct = 70;
 	Description = "Yeast, grows when warm (~37C).";
 	
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 	
 	LowPressure = IPL;