Merge branch 'master' into graphical

Putnam3145 · Feb 24, 2014 · 86a8612 · 86a8612
2 parents 79fba1a + d01840d
commit 86a8612
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/raw/objects/building_macro_fantastic.txt b/raw/objects/building_macro_fantastic.txt
@@ -54,4 +54,7 @@ building_macro_fantastic
 	[COLOR:3:2:6:0:0:0:6:0:0:0:0:6:0:0:7:0:0:0:0:0]
 	[COLOR:3:3:7:0:0:0:0:0:7:0:0:0:0:0:0:0:0:7:0:0]
 	[BUILD_LABOR:BURN_WOOD]
-	[BUILD_ITEM:1:NONE:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE]
+	[BUILD_ITEM:1:NONE:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE]
+	[BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE]
+	[BUILD_ITEM:1:BARREL:NONE:NONE:NONE][EMPTY]
+	[BUILD_ITEM:1:BUCKET:NONE:NONE:NONE][EMPTY]
diff --git a/raw/objects/reaction_macro_fantastic.txt b/raw/objects/reaction_macro_fantastic.txt
@@ -24,6 +24,13 @@ reaction_macro_fantastic
 	[PRODUCT:100:1:TOOL:SOAP_TOKEN_1_P:NONE:NONE]
 	[SKILL:ORGANIZATION]
 
+[REACTION:POTASH_MAKING_QUICK_P]
+	[NAME:make potash (quick)
+	[BUILDING:ASHERY_PLUS_WOOD_FURNACE_FANTASTIC_P:CUSTOM_P]
+	[REAGENT:A:1:WOOD:NONE:NONE:NONE]
+	[PRODUCT:100:1:BAR:NONE:POTASH:NONE][PRODUCT_DIMENSION:150]
+	[SKILL:POTASH_MAKING]
+
 [REACTION:LYE_MAKING_QUICK_P]
 	[NAME:make lye (quick)]
 	[BUILDING:ASHERY_PLUS_WOOD_FURNACE_FANTASTIC_P:CUSTOM_L]