fix oculentibus tears name and reactions, disambiguate any other "n/a…

…" state names

raw/objects/inorganic_STL.txt

@@ -104,7 +104,7 @@ inorganic_STL
 [INORGANIC:YELLOW_SAND_STL] Halfling black dirt, name changed and token edited.
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_NAME_ADJ:ALL_SOLID:yellow sand]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (yellow sand)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:178][DISPLAY_COLOR:6:6:1]
 	[SOIL_SAND][SOIL_OCEAN]
@@ -113,7 +113,7 @@ inorganic_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:CREAM]
 	[STATE_NAME_ADJ:ALL_SOLID:fine sand]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (fine sand)]
 	[STATE_NAME_ADJ:GAS:fine sand]
 	[TILE:178][DISPLAY_COLOR:7:14:0]
 
@@ -203,4 +203,4 @@ inorganic_STL
 	[SOLID_DENSITY:2600]
 	[MELTING_POINT:12970]
 	[MATERIAL_VALUE:20]
-	[STATE_COLOR:ALL_SOLID:AMETHYST] shockingly enough
+	[STATE_COLOR:ALL_SOLID:AMETHYST] shockingly enough

raw/objects/inorganic_alchemy_STL.txt

@@ -6,7 +6,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:numbing incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (numbing incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:1:0:1]
 	[SPECIAL]
@@ -15,7 +15,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:numbing incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (numbing incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:1:0:1]
 	[SPECIAL]
@@ -30,7 +30,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:stoneward incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (stoneward incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:0:6:0]
 	[SPECIAL]
@@ -39,7 +39,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:stoneward incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (stoneward incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:7:0:0]
 	[SPECIAL]
@@ -54,7 +54,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:bloodletting incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (bloodletting incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:0:6:0]
 	[SPECIAL]
@@ -63,7 +63,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:bloodletting incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (bloodletting incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:4:0:1]
 	[SPECIAL]
@@ -78,7 +78,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:hastening incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (hastening incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:0:6:0]
 	[SPECIAL]
@@ -87,7 +87,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:hastening incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (hastening incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:6:0:1]
 	[SPECIAL]
@@ -101,7 +101,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:blinding incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (blinding incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:0:6:0]
 	[SPECIAL]
@@ -110,7 +110,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:blinding incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (blinding incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:1:0:0]
 	[SPECIAL]
@@ -127,7 +127,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:paralyzing incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (paralyzing incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:0:6:0]
 	[SPECIAL]
@@ -136,7 +136,7 @@ inorganic_alchemy_STL
 	[USE_MATERIAL_TEMPLATE:VOLATILE_TEMPLATE_STL]
 	[STATE_COLOR:ALL_SOLID:BROWN]
 	[STATE_NAME_ADJ:ALL_SOLID:paralyzing incense]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (paralyzing incense)]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:2:0:1]
 	[SPECIAL]
@@ -150,9 +150,9 @@ inorganic_alchemy_STL
 
 [INORGANIC:OCULENTIBUS_TEARS_STL]
 	[USE_MATERIAL_TEMPLATE:INSECT_LIQUID_TEMPLATE_STL]
-	[STATE_COLOR:ALL_SOLID:CLEAR]
-	[STATE_NAME_ADJ:ALL_SOLID:oculentibus tears]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_COLOR:ALL:CLEAR]
+	[STATE_NAME_ADJ:ALL_SOLID:frozen oculentibus tears]
+	[STATE_NAME_ADJ:LIQUID:oculentibus tears]
 	[STATE_NAME_ADJ:GAS:smoke]
 	[TILE:178][DISPLAY_COLOR:1:0:1]
 
@@ -237,4 +237,4 @@ inorganic_alchemy_STL
 				[CDI:TARGET:A:LINE_OF_SIGHT]
 				[CDI:TARGET_RANGE:A:7]
 				[CDI:MAX_TARGET_NUMBER:A:1]
-				[CDI:WAIT_PERIOD:150]
+				[CDI:WAIT_PERIOD:150]

raw/objects/inorganic_halfling.txt

@@ -17,7 +17,7 @@ inorganic_halfling
 [INORGANIC:BLACK_DIRT_HLG]
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_NAME_ADJ:ALL_SOLID:black dirt]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (black dirt)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:178][DISPLAY_COLOR:0:8:0]
 	[SOIL][SOIL_OCEAN]
@@ -26,14 +26,16 @@ inorganic_halfling
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_COLOR:ALL_SOLID:CREAM]
 	[STATE_NAME_ADJ:ALL_SOLID:fine sand]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (fine sand)]
 	[STATE_NAME_ADJ:GAS:fine sand]
 	[TILE:178][DISPLAY_COLOR:7:14:0]
 	[SOIL_SAND][SOIL_OCEAN]
 
 [INORGANIC:ROCK_HLG][LAVA]
 	[USE_MATERIAL_TEMPLATE:STONE_TEMPLATE_HLG]
 	[STATE_NAME_ADJ:ALL_SOLID:rock]
+	[STATE_NAME_ADJ:LIQUID:molten rock]
+	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:176][DISPLAY_COLOR:7:8:0]
 	[IGNEOUS_EXTRUSIVE][IGNEOUS_INTRUSIVE][SEDIMENTARY][SEDIMENTARY_OCEAN_SHALLOW][SEDIMENTARY_OCEAN_DEEP][METAMORPHIC]
 	[IS_STONE]
@@ -64,4 +66,4 @@ inorganic_halfling
 	[SOLID_DENSITY:5000]
 	[MATERIAL_VALUE:15]
 	[IS_STONE]
-	[MELTING_POINT:12000]
+	[MELTING_POINT:12000]

raw/objects/inorganic_stone_soil_laularu.txt

@@ -5,39 +5,39 @@ inorganic_stone_soil_laularu
 [INORGANIC:DIRT_BROWN_LKR]
 	[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE_LKR]
 	[STATE_NAME_ADJ:ALL_SOLID:brown dirt]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (brown dirt)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:178][DISPLAY_COLOR:0:6:1][STATE_COLOR:ALL:BRASS]
 	[SOIL]
 
 [INORGANIC:SAND_RED_LKR]
 	[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE_LKR]
 	[STATE_NAME_ADJ:ALL_SOLID:red sand]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (red sand)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:177][DISPLAY_COLOR:4:4:1][STATE_COLOR:ALL:RED]
 	[SOIL][SOIL_SAND]
 
 [INORGANIC:DIRT_BLUE_LKR]
 	[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE_LKR]
 	[STATE_NAME_ADJ:ALL_SOLID:blue dirt]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (blue dirt)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:178][DISPLAY_COLOR:0:1:1][STATE_COLOR:ALL:DARK_BLUE]
 	[SOIL][AQUIFER]
 
 [INORGANIC:OOZE_BLACK_LKR]
 	[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE_LKR]
 	[STATE_NAME_ADJ:ALL_SOLID:black ooze]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (black ooze)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:247][DISPLAY_COLOR:0:0:1][STATE_COLOR:ALL:BLACK]
 	[SOIL_OCEAN]
 
 [INORGANIC:OOZE_BLUE_LKR]
 	[USE_MATERIAL_TEMPLATE:SOIL_TEMPLATE_LKR]
 	[STATE_NAME_ADJ:ALL_SOLID:blue ooze]
-	[STATE_NAME_ADJ:LIQUID:n/a]
+	[STATE_NAME_ADJ:LIQUID:n/a (blue ooze)]
 	[STATE_NAME_ADJ:GAS:dust]
 	[TILE:247][DISPLAY_COLOR:0:1:1][STATE_COLOR:ALL:DARK_BLUE]
-	[SOIL_OCEAN][AQUIFER]
+	[SOIL_OCEAN][AQUIFER]

raw/objects/material_template_general_STL.txt

@@ -8,10 +8,10 @@ material_template_general_STL
 	[STATE_COLOR:GAS:GRAY]
 	[STATE_NAME:ALL_SOLID:chitin]
 	[STATE_ADJ:ALL_SOLID:chitin]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:LIQUID:n/a (chitin)]
+	[STATE_ADJ:LIQUID:n/a (chitin)]
+	[STATE_NAME:GAS:n/a (chitin)]
+	[STATE_ADJ:GAS:n/a (chitin)]
 	[MATERIAL_VALUE:1]
 	[SPEC_HEAT:420]
 	[IGNITE_POINT:10500]
@@ -51,10 +51,10 @@ material_template_general_STL
 	[STATE_COLOR:GAS:GRAY]
 	[STATE_NAME:ALL_SOLID:chitin]
 	[STATE_ADJ:ALL_SOLID:chitin]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:LIQUID:n/a (chitin)]
+	[STATE_ADJ:LIQUID:n/a (chitin)]
+	[STATE_NAME:GAS:n/a (chitin)]
+	[STATE_ADJ:GAS:n/a (chitin)]
 	[MATERIAL_VALUE:2]
 	[SPEC_HEAT:420]
 	[IGNITE_POINT:10500]
@@ -162,8 +162,8 @@ material_template_general_STL
 	[STATE_NAME:LIQUID:liquid]
 	[STATE_ADJ:LIQUID:liquid]
 	[STATE_COLOR:GAS:CLEAR]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:vapor]
+	[STATE_ADJ:GAS:vapor]
 	[DISPLAY_COLOR:7:0:1]
 	[MATERIAL_VALUE:1]
 	[SPEC_HEAT:4181]
@@ -209,11 +209,11 @@ material_template_general_STL
 	[STATE_NAME:ALL_SOLID:spider silk]
 	[STATE_ADJ:ALL_SOLID:spider silk]
 	[STATE_COLOR:LIQUID:WHITE]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
+	[STATE_NAME:LIQUID:n/a (spider silk)]
+	[STATE_ADJ:LIQUID:n/a (spider silk)]
 	[STATE_COLOR:GAS:WHITE]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:n/a (spider silk)]
+	[STATE_ADJ:GAS:n/a (spider silk)]
 	[DISPLAY_COLOR:7:0:1]
 	[MATERIAL_VALUE:4]
 	[SPEC_HEAT:420]
@@ -252,11 +252,11 @@ material_template_general_STL
 	[STATE_NAME:ALL_SOLID:aurum]
 	[STATE_ADJ:ALL_SOLID:aurum]
 	[STATE_COLOR:LIQUID:GOLDEN_YELLOW]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
+	[STATE_NAME:LIQUID:n/a (aurum)]
+	[STATE_ADJ:LIQUID:n/a (aurum)]
 	[STATE_COLOR:GAS:GOLDEN_YELLOW]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:n/a (aurum)]
+	[STATE_ADJ:GAS:n/a (aurum)]
 	[DISPLAY_COLOR:6:0:1]
 	[MATERIAL_VALUE:40] Value higher than gold because this is spun by spiders at the heart of the earth. That's a /nice/ supply restriction right there.
 	[SPEC_HEAT:129]
@@ -296,8 +296,8 @@ material_template_general_STL
 	[STATE_NAME:LIQUID:liquid sunshine]
 	[STATE_ADJ:LIQUID:liquid sunshine]
 	[STATE_COLOR:GAS:CLEAR]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:boiling sunshine]
+	[STATE_ADJ:GAS:boiling sunshine]
 	[DISPLAY_COLOR:7:0:1]
 	[MATERIAL_VALUE:1]
 	[SPEC_HEAT:4181]
@@ -337,10 +337,10 @@ material_template_general_STL
 	[STATE_COLOR:GAS:GRAY]
 	[STATE_NAME:ALL_SOLID:shell]
 	[STATE_ADJ:ALL_SOLID:shell]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:LIQUID:n/a (shell)]
+	[STATE_ADJ:LIQUID:n/a (shell)]
+	[STATE_NAME:GAS:n/a (shell)]
+	[STATE_ADJ:GAS:n/a (shell)]
 	[MATERIAL_VALUE:10]
 	[SPEC_HEAT:420]
 	[IGNITE_POINT:10500]
@@ -416,4 +416,4 @@ material_template_general_STL
 	[BENDING_FRACTURE:10000]
 	[BENDING_STRAIN_AT_YIELD:100]
 	[MAX_EDGE:1000]
-	[ABSORPTION:0]
+	[ABSORPTION:0]

raw/objects/material_template_hell_STL.txt

@@ -8,10 +8,10 @@ material_template_hell_STL
 	[STATE_COLOR:GAS:BLACK]
 	[STATE_NAME:ALL_SOLID:shadow]
 	[STATE_ADJ:ALL_SOLID:shadow]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:LIQUID:n/a (shadow)]
+	[STATE_ADJ:LIQUID:n/a (shadow)]
+	[STATE_NAME:GAS:n/a (shadow)]
+	[STATE_ADJ:GAS:n/a (shadow)]
 	[MATERIAL_VALUE:1]
 	[SPEC_HEAT:420]
 	[IGNITE_POINT:NONE]
@@ -41,4 +41,4 @@ material_template_hell_STL
 	[BENDING_YIELD:11000]
 	[BENDING_FRACTURE:18000]
 	[BENDING_STRAIN_AT_YIELD:100]
-	[MAX_EDGE:1000]
+	[MAX_EDGE:1000]

raw/objects/material_template_organic_bfel.txt

@@ -10,8 +10,8 @@ material_template_organic_bfel
 	[STATE_NAME:LIQUID:sap]
 	[STATE_ADJ:LIQUID:sappy]
 	[STATE_COLOR:GAS:BROWN]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:n/a (elfwood)]
+	[STATE_ADJ:GAS:n/a (elfwood)]
 	[DISPLAY_COLOR:6:0:0]
 	[MATERIAL_VALUE:-2]
 	[SPEC_HEAT:420]

raw/objects/material_template_ztg.txt

@@ -7,11 +7,11 @@ material_template_ztg
 	[STATE_NAME:ALL_SOLID:sinew]
 	[STATE_ADJ:ALL_SOLID:sinew]
 	[STATE_COLOR:LIQUID:PINK]
-	[STATE_NAME:LIQUID:n/a]
-	[STATE_ADJ:LIQUID:n/a]
+	[STATE_NAME:LIQUID:n/a (sinew)]
+	[STATE_ADJ:LIQUID:n/a (sinew)]
 	[STATE_COLOR:GAS:PINK]
-	[STATE_NAME:GAS:n/a]
-	[STATE_ADJ:GAS:n/a]
+	[STATE_NAME:GAS:n/a (sinew)]
+	[STATE_ADJ:GAS:n/a (sinew)]
 	[DISPLAY_COLOR:4:0:0]
 	[MATERIAL_VALUE:1]
 	[SPEC_HEAT:4181]
@@ -182,4 +182,4 @@ material_template_ztg
 	[ABSORPTION:100]
 	[ROTS]
 	[GENERATES_MIASMA]
-	[BUTCHER_SPECIAL:GLOB:NONE]
+	[BUTCHER_SPECIAL:GLOB:NONE]