diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-09 20:03:49 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-09 20:03:49 -0700 |
| commit | 973d5040ffd62d98d8ed11e184dcd518007d54d1 (patch) | |
| tree | 9021da7e27f7f5c14b728ae86dc763dc82756050 /revert-07_Remove-handload-quality-distinction-1481.patch | |
| parent | Fix examine->search->no result crash. (diff) | |
| download | cataclysm-bn-973d5040ffd62d98d8ed11e184dcd518007d54d1.tar.xz | |
Updated to 2022-09-09-2252
Fixed johhnycakes to be veggy material and not wheat since only cornmeal can make them.
Updated other patches for recent changes.
Diffstat (limited to 'revert-07_Remove-handload-quality-distinction-1481.patch')
| -rw-r--r-- | revert-07_Remove-handload-quality-distinction-1481.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch index 4a9ec6a..28f296b 100644 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ b/revert-07_Remove-handload-quality-distinction-1481.patch @@ -1631,7 +1631,7 @@ diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json index a3819132f6..b8c26c57dd 100644 --- a/data/json/obsoletion/items.json +++ b/data/json/obsoletion/items.json -@@ -3707,5 +3707,631 @@ +@@ -3707,6 +3707,632 @@ "transform_age": 21600, "not_ready_msg": "The cream has not risen yet." } @@ -2261,8 +2261,9 @@ index a3819132f6..b8c26c57dd 100644 + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] + }, + { + "id": "flu_shot", diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json index 36e24fedb5..ef04e54bbe 100644 --- a/data/json/obsoletion/recipes.json |