aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-28 17:13:40 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-28 17:13:40 -0700
commit1cf4429ff844f798a7c60a7fe4bbc2f616a08f74 (patch)
tree1a9ec013f99dca7d96052fc8ad012a1487287334
parentAdd jokyu_fuku to laundry drops (diff)
downloadcataclysm-dda-mod_battle-maid-redone-1cf4429ff844f798a7c60a7fe4bbc2f616a08f74.tar.xz
Remove recipe that snuck out of testing
Fix typo
-rw-r--r--melee.json2
-rw-r--r--recipes.json20
2 files changed, 1 insertions, 21 deletions
diff --git a/melee.json b/melee.json
index 0493fc7..03ea3b2 100644
--- a/melee.json
+++ b/melee.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"category" : "weapons",
"name": { "str": "maid's kitchen knife" },
- "description": "It is a kitchen knife suitable for combat. It slices through enemies of your Mistress just as easily as it would food.",\
+ "description": "It is a kitchen knife suitable for combat. It slices through enemies of your Mistress just as easily as it would food.",
"weight": "450 g",
"volume": "250 ml",
"price": 9000,
diff --git a/recipes.json b/recipes.json
index 07fa4c2..8743381 100644
--- a/recipes.json
+++ b/recipes.json
@@ -520,26 +520,6 @@
]
},
{
- "type" : "recipe",
- "result": "flask_shoggoth",
- "category": "CC_OTHER",
- "skill_used": "cooking",
- "difficulty": 9,
- "time": "100 m",
- "reversible": false,
- "autolearn": false,
- "book_learn": [ [ "book_shoggoth", 9 ] ],
- "tools": [
- [ [ "chemistry_set", 5 ] ]
- ],
- "components": [
- [ [ "meat_shoggoth", 1 ] ],
- [ [ "flask_glass", 1 ] ],
- [ [ "blood", 10 ] ],
- [ [ "maid_dress", 1 ] ]
- ]
- },
- {
"type" : "recipe",
"result": "man_carrier",
"category": "CC_ARMOR",