Skip to content

Commit

Permalink
Merge pull request #44173 from anothersimulacrum/recime11
Browse files Browse the repository at this point in the history
Boiling automated recipe activity changes
  • Loading branch information
Rivet-the-Zombie authored Sep 14, 2020
2 parents c631331 + 243777d commit a883429
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions data/json/recipes/chem/fuel.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"result": "chem_ethanol",
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"byproducts": [ [ "water_clean" ] ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_FUEL",
Expand All @@ -25,7 +25,7 @@
{
"result": "denat_alcohol",
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"byproducts": [ [ "water_clean" ] ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_FUEL",
Expand Down
12 changes: 6 additions & 6 deletions data/json/recipes/food/distill.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "brandy",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand All @@ -18,7 +18,7 @@
{
"result": "gin",
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"id_suffix": "from_mash",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand All @@ -34,7 +34,7 @@
{
"result": "vodka",
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"id_suffix": "from_wash",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand All @@ -49,7 +49,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "rum",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand All @@ -64,7 +64,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "whiskey",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand All @@ -79,7 +79,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "moonshine",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREW",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/food/other.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "molasses",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
Expand All @@ -17,7 +17,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "young_yeast",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/other/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "stomach_sealed",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_CONTAINERS",
Expand All @@ -104,7 +104,7 @@
},
{
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"result": "large_stomach_sealed",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_CONTAINERS",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/other/medical.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{
"result": "bandages_makeshift_boiled",
"type": "recipe",
"activity_level": "fake",
"activity_level": "LIGHT_EXERCISE",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MEDICAL",
"skill_used": "firstaid",
Expand Down
Loading

0 comments on commit a883429

Please sign in to comment.