From c91c5214972007062998c341c0e5b226eed9267b Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 25 Jan 2021 13:31:31 -0800 Subject: Merge CBM fixes into one patch Expand CBM fixes to scalpels and hearing --- 0011-add-missing-mre.patch | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 0011-add-missing-mre.patch (limited to '0011-add-missing-mre.patch') diff --git a/0011-add-missing-mre.patch b/0011-add-missing-mre.patch new file mode 100644 index 0000000..f776e12 --- /dev/null +++ b/0011-add-missing-mre.patch @@ -0,0 +1,39 @@ +--- 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 }, -- cgit v1.2.1