Merge CBM fixes into one patch

Expand CBM fixes to scalpels and hearing

1 files changed, 58 insertions, 0 deletions

diff --git a/0008-npc-can-use-more-bionics.patch b/0008-npc-can-use-more-bionics.patch
new file mode 100644
index 0000000..57e4720
--- /dev/null
+++ b/0008-npc-can-use-more-bionics.patch
@@ -0,0 +1,58 @@
+--- a/data/json/bionics.json
++++ b/data/json/bionics.json
+@@ -337,7 +337,7 @@
+     "name": { "str": "Enhanced Hearing" },
+     "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person.  Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
+     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
+-    "flags": [ "BIONIC_TOGGLED" ],
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+     "included_bionics": [ "bio_earplugs" ]
+   },
+   {
+@@ -1000,7 +1000,8 @@
+     "name": { "str": "Autonomous Surgical Scalpels" },
+     "description": "A system of surgical grade scalpels is implanted on your fingers.  They allow you to make automated precise cuts and can also be used as a high-quality butchering tool.",
+     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "ARM_L", 1 ] ],
+-    "fake_item": "bio_scalpel"
++    "fake_item": "bio_scalpel",
++    "flags": [ "BIONIC_NPC_USABLE" ]
+   },
+   {
+     "id": "bio_sunglasses",
+@@ -1196,6 +1197,6 @@
+     "name": { "str": "Soporific Induction" },
+     "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
+     "occupied_bodyparts": [ [ "HEAD", 1 ] ],
+-    "flags": [ "BIONIC_TOGGLED" ]
++    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+   }
+ ]
+--- a/data/json/items/bionics.json
++++ b/data/json/items/bionics.json
+@@ -266,7 +266,7 @@
+   },
+   {
+     "id": "bio_ears",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Enhanced Hearing CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -741,7 +741,7 @@
+   },
+   {
+     "id": "bio_fuel_cell_gasoline",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Gasoline Fuel Cell CBM" },
+     "looks_like": "bio_int_enhancer",
+@@ -839,7 +839,7 @@
+   },
+   {
+     "id": "bio_surgical_razor",
+-    "copy-from": "bionic_general",
++    "copy-from": "bionic_general_npc_usable",
+     "type": "BIONIC_ITEM",
+     "name": { "str": "Autonomous Surgical Scalpels CBM" },
+     "looks_like": "bio_int_enhancer",