Fix conflicts with tacoma updates.

1 files changed, 0 insertions, 48 deletions

diff --git a/npc-02_tacoma-update.patch b/npc-02_tacoma-update.patch
index b70a534..d3acbce 100644
--- a/npc-02_tacoma-update.patch
+++ b/npc-02_tacoma-update.patch
@@ -157,36 +157,6 @@
      "dialogue": {
        "describe": "We need help…",
        "offer": "Have you heard of a book called the 'Guide to Advanced Emergency Care?'  I really need a copy.  The doctor is requesting a lot of supplies that I'm not familiar with but I believe I could make if I could get a copy of the book.",
-@@ -308,29 +310,6 @@
-     }
-   },
-   {
--    "id": "MISSION_RANCH_NURSE_10",
--    "type": "mission_definition",
--    "name": { "str": "Find a Flu Shot" },
--    "goal": "MGOAL_FIND_ITEM",
--    "difficulty": 5,
--    "value": 50000,
--    "item": "flu_shot",
--    "start": "ranch_nurse_9",
--    "origins": [ "ORIGIN_SECONDARY" ],
--    "followup": "MISSION_RANCH_NURSE_11",
--    "dialogue": {
--      "describe": "We need help…",
--      "offer": "The doctor has some ideas on how to recreate a vaccination program for the common flu.  If you come across an unused flu shot please bring it to me.  We haven't had any fatalities from the flu yet but it is only a matter of time until one of the older or younger members of the outpost gets a bad case.",
--      "accepted": "I'm counting on you.",
--      "rejected": "Come back when you get a chance.  We need skilled survivors.",
--      "advice": "Hospitals or clinics might have a few that haven't been used.",
--      "inquire": "Do you have the flu shot?",
--      "success": "Thank you for your assistance.",
--      "success_lie": "What good does this do us?",
--      "failure": "It was a lost cause anyways…"
--    }
--  },
--  {
-     "id": "MISSION_RANCH_NURSE_11",
-     "type": "mission_definition",
-     "name": { "str": "Find 10 Syringes" },
 @@ -339,6 +318,7 @@
      "value": 50000,
      "item": "syringe",
@@ -407,21 +377,3 @@
        ],
        "terrain": {
          "w": "t_wall",
-@@ -815,15 +814,8 @@
-         "W.......rW  ",
-         "WWW....WWW  "
-       ],
--      "terrain": {
--        "r": "t_dirtfloor",
--        "W": "t_wall_log",
--        ".": "t_dirtfloor",
--        "c": "t_conveyor",
--        "m": "t_machinery_old",
--        "M": "t_machinery_heavy"
--      },
--      "furniture": { "r": "f_rack" },
-+      "terrain": { "r": "t_dirtfloor", "W": "t_wall_log", ".": "t_dirtfloor", "m": "t_dirtfloor", "M": "t_dirtfloor", "c": "t_conveyor" },
-+      "furniture": { "m": "f_machinery_old", "M": "f_machinery_heavy", "r": "f_rack" },
-       "place_item": [
-         { "item": "log", "x": 3, "y": 0 },
-         { "item": "log", "x": 3, "y": 1 },