Merge remote-tracking branch 'origin/wip-vyznev-bugfix'

vyznev · Oct 6, 2013 · fe7e78e · fe7e78e
2 parents 4aff608 + 70dde53
commit fe7e78e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/raw/objects/item_new_halfling.txt b/raw/objects/item_new_halfling.txt
@@ -32,6 +32,7 @@ item_new_halfling.txt
 	[MATERIAL_SIZE:1]
 	[LAYER_SIZE:1]
 	[LAYER_PERMIT:1]
+	[SHAPED]
 	[LAYER:OVER]
 	[LEATHER]
 	[COVERAGE:100]
@@ -65,4 +66,4 @@ item_new_halfling.txt
 	[COVERAGE:100]
 	[LAYER_SIZE:1]
 	[LAYER_PERMIT:1]
-	[LEATHER]
+	[LEATHER]
diff --git a/raw/objects/plant_REM.txt b/raw/objects/plant_REM.txt
@@ -182,7 +182,7 @@ plant_REM
 	[UNDERGROUND_DEPTH:0:0]
 	[SHRUB_TILE:142]
 	[DEAD_SHRUB_TILE:28]
-	[SHRUB_COLOR:5:13:0]
+	[SHRUB_COLOR:5:0:0]
 	[DEAD_SHRUB_COLOR:5:0:0]
 
 [PLANT:TEA_PURPLE_DRY_REM]
@@ -206,4 +206,4 @@ plant_REM
 	[FREQUENCY:75]
 	[CLUSTERSIZE:5]
 	[PREFSTRING:rich taste]
-	[PREFSTRING:violet hue]
+	[PREFSTRING:violet hue]
diff --git a/raw/objects/reaction_STL.txt b/raw/objects/reaction_STL.txt
@@ -24,16 +24,3 @@ reaction_STL
 	[REAGENT:A:1:BOULDER:NONE:INORGANIC:CELESTIUM_ORE_STL]
 	[PRODUCT:100:1:THREAD:NO_SUBTYPE:METAL:CELESTIUM_METAL_STL][PRODUCT_DIMENSION:15000]
 	[SKILL:EXTRACT_STRAND]
-
-[REACTION:INCENSE_TEST]
-	[NAME:summon test vigor]
-	[REAGENT:B_HOLDER:1:NONE:NONE:NONE:NONE][EMPTY][FOOD_STORAGE_CONTAINER][PRESERVE_REAGENT][DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
-	[PRODUCT:100:5:DRINK:NONE:INORGANIC:VIGOR_HYDRA_STL][PRODUCT_TO_CONTAINER:B_HOLDER][PRODUCT_DIMENSION:150]
-	[SKILL:SMELT]
-	[ADVENTURE_MODE_ENABLED]
-
-[REACTION:BARREL_TEST]
-	[NAME:summon barrel]
-	[PRODUCT:100:1:BARREL:NONE:INORGANIC:ROCK_HLG]
-	[SKILL:SMELT]
-	[ADVENTURE_MODE_ENABLED]