summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-12-07 16:26:53 (GMT)
committer Simon <simon@hardwired.org.uk>2010-12-07 16:26:53 (GMT)
commit46940a8e4f25b31bfd422c7096042f6c595a05e6 (patch)
tree186e719aae62c642852729a89b006a92eaa30617 /includes
parent0dee48278f9f1f9ccc5dd7cf1262fd84da29cca2 (diff)
downloadpowder-46940a8e4f25b31bfd422c7096042f6c595a05e6.zip
powder-46940a8e4f25b31bfd422c7096042f6c595a05e6.tar.gz
Added saving of pause state and particle tmp value, removed INST from the menu
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h2
-rw-r--r--includes/powder.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/defines.h b/includes/defines.h
index 18c9869..ed3eb00 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -8,7 +8,7 @@
#endif
#define SAVE_VERSION 44
-#define MINOR_VERSION 2
+#define MINOR_VERSION 3
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
#define BETA
diff --git a/includes/powder.h b/includes/powder.h
index 6bed6df..c983df8 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -372,7 +372,7 @@ static const part_type ptypes[PT_NUM] =
{"@_@", PIXPACK(0x00FF77), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 2, 0, 0, 0, 20, 1, 30, SC_LIQUID, R_TEMP+0.0f +273.15f, 29, "@_@, contradicts the normal state changes.", TYPE_LIQUID},
{"@_@G", PIXPACK(0x00FFBB), 1.0f, 0.01f * CFDS, 0.99f, 0.30f, -0.1f, 0.0f, 2.75f, 0.000f * CFDS, 0, 0, 0, 0, 1, 0, 1, SC_CRACKER, R_TEMP-200.0f+273.15f, 42, "@_@ gas", TYPE_GAS},
{"@_@S", PIXPACK(0x00E455), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 0, 100, SC_CRACKER, R_TEMP+300.0f+273.15f, 251, "@_@ solid", TYPE_SOLID},
- {"INST", PIXPACK(0x404039), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Instantly conducts, like walls, is now also a battery, PSCN to charge, NSCN to take.", TYPE_SOLID|PROP_CONDUCTS},
+ {"INST", PIXPACK(0x404039), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 0, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Instantly conducts, like walls, is now also a battery, PSCN to charge, NSCN to take.", TYPE_SOLID|PROP_CONDUCTS},
{"ISOZ", PIXPACK(0xAA30D0), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 2, 0, 0, 0, 20, 1, 24, SC_NUCLEAR, R_TEMP-2.0f +273.15f, 29, "Radioactive liquid", TYPE_LIQUID|PROP_NEUTPENETRATE},
{"ISZS", PIXPACK(0x662089), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, -0.0007f* CFDS, 0, 0, 0, 1, 1, 1, 100, SC_NUCLEAR, 140.00f, 251, "Solid form of ISOZ, slowly decays.", TYPE_SOLID},
{"PRTI", PIXPACK(0xEB5917), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, -0.005f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_NUCLEAR, R_TEMP+0.0f +273.15f, 40, "Portal IN. Things go in here", TYPE_SOLID},