diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-31 20:26:08 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-01-31 20:26:08 -0800 |
| commit | 5df800d05b7ca9e8d7d79ef33fcdcead0785b75a (patch) | |
| tree | 4f49044af83273900da7a277a3e368762d0533cd /0011-add-missing-mre.patch | |
| parent | Fix more inconsistent ammo names (diff) | |
| download | cataclysm-dda-5df800d05b7ca9e8d7d79ef33fcdcead0785b75a.tar.xz | |
Update to 0.F.3
Port various patches from BN
Diffstat (limited to '0011-add-missing-mre.patch')
| -rw-r--r-- | 0011-add-missing-mre.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/0011-add-missing-mre.patch b/0011-add-missing-mre.patch deleted file mode 100644 index f776e12..0000000 --- a/0011-add-missing-mre.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/data/json/itemgroups/Food/food.json -+++ b/data/json/itemgroups/Food/food.json -@@ -550,8 +550,10 @@ - { "item": "mre_cheesetort_box" }, - { "item": "mre_mushroomfettuccine_box" }, - { "item": "mre_mexicanchickenstew_box" }, -+ { "item": "mre_chickenburritobowl_box" }, - { "item": "mre_maplesausage_box" }, - { "item": "mre_ravioli_box" }, -+ { "item": "mre_pepperjackbeef_box" }, - { "item": "mre_hashbrownbacon_box" }, - { "item": "mre_lemontuna_box" }, - { "item": "mre_asianbeef_box" }, ---- a/data/json/npcs/items_generic.json -+++ b/data/json/npcs/items_generic.json -@@ -812,8 +812,10 @@ - [ "mre_cheesetort_box", 6 ], - [ "mre_mushroomfettuccine_box", 6 ], - [ "mre_mexicanchickenstew_box", 6 ], -+ [ "mre_chickenburritobowl_box", 6 ], - [ "mre_maplesausage_box", 6 ], - [ "mre_ravioli_box", 6 ], -+ [ "mre_pepperjackbeef_box", 6 ], - [ "mre_hashbrownbacon_box", 6 ], - [ "mre_lemontuna_box", 6 ], - [ "mre_asianbeef_box", 6 ], ---- a/data/json/npcs/NC_SOLDIER.json -+++ b/data/json/npcs/NC_SOLDIER.json -@@ -162,8 +162,10 @@ - { "item": "mre_cheesetort_box", "prob": 45 }, - { "item": "mre_mushroomfettuccine_box", "prob": 45 }, - { "item": "mre_mexicanchickenstew_box", "prob": 45 }, -+ { "item": "mre_chickenburritobowl_box", "prob": 45 }, - { "item": "mre_maplesausage_box", "prob": 45 }, - { "item": "mre_ravioli_box", "prob": 45 }, -+ { "item": "mre_pepperjackbeef_box", "prob": 45 }, - { "item": "mre_hashbrownbacon_box", "prob": 45 }, - { "item": "mre_lemontuna_box", "prob": 45 }, - { "item": "mre_asianbeef_box", "prob": 45 }, |