Merge branch 'CleverRaven:master' into cnk

SurFlurer · Mar 4, 2023 · 1076f1e · 1076f1e
2 parents 41aa06b + 4ea6fb5
commit 1076f1e
Show file tree

Hide file tree

Showing 60 changed files with 3,455 additions and 259 deletions.
diff --git a/data/core/tips.json b/data/core/tips.json
@@ -629,6 +629,13 @@
     "category": "tip",
     "text": [ "Winners don't do drugs.  They're too valuable.  Winners trade drugs for more bullets." ]
   },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [
+      "If you don't have a certain proficiency, having a related book is a good idea.  More books make you less likely to fail, but not as good as knowing the subject for yourself."
+    ]
+  },
   {
     "type": "snippet",
     "category": "tip",

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -148,7 +148,7 @@
     "name": { "str": "Protective Lenses" },
     "description": "Your eye sockets have been surgically sealed with highly protective mirrored lenses and your tear ducts have been re-routed to your mouth.  When you cry, you must spit out or swallow your tears.",
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
-    "mutation_conflicts": [ "COMPOUND_EYES", "CEPH_VISION", "CEPH_EYES", "EYEBULGE", "EYESTALKS1", "EYESTALKS2" ],
+    "mutation_conflicts": [ "COMPOUND_EYES", "CEPH_VISION", "CEPH_EYES", "EYEBULGE", "MEMBRANE", "EYESTALKS1", "EYESTALKS2" ],
     "social_modifiers": { "intimidate": 10 },
     "passive_pseudo_items": [ "armor_bio_eyes" ]
   },