Merge pull request #17 from CleverRaven/master

ChattyCyborg July 07

.clang-tidy

@@ -16,7 +16,6 @@ misc-*,\
 modernize-*,\
 performance-*,\
 readability-*,\
--bugprone-inaccurate-erase,\
 -bugprone-incorrect-roundings,\
 -bugprone-integer-division,\
 -bugprone-macro-parentheses,\
@@ -27,7 +26,6 @@ readability-*,\
 -bugprone-undefined-memory-manipulation,\
 -bugprone-unused-return-value,\
 -bugprone-use-after-move,\
--cert-dcl03-c,\
 -cert-dcl16-c,\
 -cert-dcl21-cpp,\
 -cert-dcl50-cpp,\
@@ -43,11 +41,9 @@ readability-*,\
 -misc-definitions-in-headers,\
 -misc-non-private-member-variables-in-classes,\
 -misc-redundant-expression,\
--misc-static-assert,\
 -misc-unconventional-assign-operator,\
 -modernize-avoid-c-arrays,\
 -modernize-deprecated-headers,\
--modernize-loop-convert,\
 -modernize-make-unique,\
 -modernize-pass-by-value,\
 -modernize-raw-string-literal,\

data/json/bionics.json

@@ -451,8 +451,8 @@
   {
     "id": "bio_gills",
     "type": "bionic",
-    "name": "Oxygenator",
-    "description": "A complex oxygen delivery system.  Improves the ability to extract oxygen from air and allows extracting it from water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
+    "name": "Respirator",
+    "description": "A complex respiration augmentation system.  Improves respiration ability in air and allows breathing water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
     "occupied_bodyparts": [ [ "TORSO", 8 ], [ "HEAD", 2 ], [ "MOUTH", 2 ] ],
     "flags": [ "BIONIC_TOGGLED" ]
   },