[pull] master from CleverRaven:master

.astylerc

@@ -49,3 +49,8 @@
 # insert space padding around parentheses on the inside only
 --pad-paren-in
 
+# exclude src/third-party
+--exclude=src/third-party
+
+# but don't be sad about no tests/src/third-party
+--ignore-exclude-errors-x

.github/stale.yml

@@ -12,10 +12,11 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
-  - <Bug>
-  - <Bugfix>
+  - "<Bug>"
+  - "<Bugfix>"
   - "<Crash / Freeze>"
   - "Organization: Bounty"
+  - "Good First Issue"
   - "(P1 - Critical)"
   - "(P2 - High)"
   - "(P3 - Medium)"

.github/workflows/msvc-full-features.yml

@@ -135,8 +135,8 @@ jobs:
 
     - name: Build
       run: |
-          cd msvc-full-features
-          msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static;ObjectCreator-vcpkg-static" Cataclysm-vcpkg-static.sln
+          msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static" msvc-full-features/Cataclysm-vcpkg-static.sln
+          msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:ObjectCreator-vcpkg-static" msvc-object_creator/ObjectCreator-vcpkg-static.sln
 
     - name: Post-build ccache manipulation
       if: ${{ !failure() }}

data/core/world_option_sliders.json

@@ -15,13 +15,13 @@
       {
         "level": 1,
         "name": "Rural",
-        "description": "Cities are twice as small and twice as far apart.",
+        "description": "Cities are half as large and twice as far apart.",
         "options": [ { "option": "CITY_SIZE", "type": "int", "val": 4 }, { "option": "CITY_SPACING", "type": "int", "val": 8 } ]
       },
       {
         "level": 2,
         "name": "Semirural",
-        "description": "Cities are 50% smaller and 50% farther apart.",
+        "description": "Cities are 25% smaller and 50% farther apart.",
         "options": [ { "option": "CITY_SIZE", "type": "int", "val": 6 }, { "option": "CITY_SPACING", "type": "int", "val": 6 } ]
       },
       {

data/json/bionics.json

@@ -465,9 +465,9 @@
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "battery" ],
     "fuel_efficiency": 1,
-    "fuel_capacity": 2000,
     "time": "1 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_battery_compartment" ]
   },
   {
     "id": "bio_blade",
@@ -780,11 +780,11 @@
     "description": "You burn alcohol as fuel in an extremely efficient reaction.",
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "alcohol" ],
-    "fuel_capacity": 400,
     "fuel_efficiency": 0.5,
     "exothermic_power_gen": true,
     "time": "1 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_ethanol_tank" ]
   },
   {
     "id": "bio_lampoil",
@@ -793,11 +793,11 @@
     "description": "Slowly generates bionic power out of kerosene or motor oil.",
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "lamp_oil", "motor_oil" ],
-    "fuel_capacity": 750,
     "fuel_efficiency": 0.35,
     "exothermic_power_gen": true,
     "time": "5 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_oil_tank" ]
   },
   {
     "id": "bio_evap",
@@ -1118,7 +1118,7 @@
     "id": "bio_memory",
     "type": "bionic",
     "name": { "str": "Enhanced Memory Banks" },
-    "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you can't forget skills you've already learned.",
+    "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you forget skills you've learned slower.",
     "occupied_bodyparts": [ [ "head", 3 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "active_flags": [ "CBQ_LEARN_BONUS" ],
@@ -1674,11 +1674,11 @@
     "occupied_bodyparts": [ [ "torso", 8 ] ],
     "encumbrance": [ [ "torso", 5 ] ],
     "fuel_options": [ "gasoline" ],
-    "fuel_capacity": 500,
     "fuel_efficiency": 0.25,
     "exothermic_power_gen": true,
     "time": "1 s",
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE" ],
+    "passive_pseudo_items": [ "internal_gasoline_tank" ]
   },
   {
     "id": "bio_syringe",