merging conflicts

.github/workflows/pull-translations.yml

@@ -22,7 +22,7 @@ jobs:
       - name: "Pull translations"
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx pull
+        run: tx pull --force
       - name: Create Pull Request
         uses: peter-evans/[email protected]
         with:

data/json/character_modifiers.json

@@ -123,6 +123,18 @@
       "denominator": 6.0
     }
   },
+  {
+    "type": "character_mod",
+    "id": "obstacle_climb_mod",
+    "description": "Obstacle climb modifier <color_dark_gray>(Crawl, Grip, Lift)</color>",
+    "mod_type": "x",
+    "value": {
+      "limb_score": [ [ "crawl", 3.0 ], [ "grip", 2.0 ], "lift" ],
+      "override_encumb": true,
+      "limb_score_op": "+",
+      "denominator": 6.0
+    }
+  },
   {
     "type": "character_mod",
     "id": "limb_str_mod",

data/json/flags.json

@@ -394,6 +394,12 @@
     "//": "Prevents repairing of this item even if otherwise suitable tools exist.",
     "inherit": false
   },
+  {
+    "id": "NO_CLEAN",
+    "type": "json_flag",
+    "//": "items that are impossible to clean no matter how hard you try",
+    "info": "This item is impossible to clean."
+  },
   {
     "id": "NUTRIENT_OVERRIDE",
     "type": "json_flag",
@@ -580,17 +586,17 @@
   {
     "id": "PALS_SMALL",
     "type": "json_flag",
-    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> taking a <good>small ammount of space</good>."
+    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> taking a <good>small amount of space</good>."
   },
   {
     "id": "PALS_MEDIUM",
     "type": "json_flag",
-    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> taking an average ammount of space."
+    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> taking an average amount of space."
   },
   {
     "id": "PALS_LARGE",
     "type": "json_flag",
-    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> take a <bad>large ammount of space</bad>."
+    "info": "This item will <good>attach directly</good> to <info>load bearing vests</info> take a <bad>large amount of space</bad>."
   },
   {
     "id": "PSYSHIELD_PARTIAL",
@@ -1924,76 +1930,6 @@
     "type": "json_flag",
     "info": "This is meant for exosuit leg plating."
   },
-  {
-    "id": "EXO_BOOT_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit foot plating."
-  },
-  {
-    "id": "EXO_SMALL",
-    "type": "json_flag",
-    "info": "This is meant for a small exosuit hardpoint."
-  },
-  {
-    "id": "EXO_LARGE",
-    "type": "json_flag",
-    "info": "This is meant for a large exosuit hardpoint."
-  },
-  {
-    "id": "EXO_PSU",
-    "type": "json_flag",
-    "info": "This is meant for an exosuit PSU hardpoint."
-  },
-  {
-    "id": "EXO_SMALL_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for small exosuit gadgets, 1 L or less."
-  },
-  {
-    "id": "EXO_HELMET_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for helmet-specific gadgets."
-  },
-  {
-    "id": "EXO_MEDIUM_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for medium exosuit gadgets, between 1 L and 5 L."
-  },
-  {
-    "id": "EXO_LARGE_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for large exosuit gadgets, larger than 5 L."
-  },
-  {
-    "id": "EXO_HELMET_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit helmet plating."
-  },
-  {
-    "id": "EXO_TORSO_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit torso plating."
-  },
-  {
-    "id": "EXO_PSU_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit PSU plating."
-  },
-  {
-    "id": "EXO_ARM_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
-  },
-  {
-    "id": "EXO_GLOVE_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
-  },
-  {
-    "id": "EXO_LEG_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit leg plating."
-  },
   {
     "id": "EXO_BOOT_PLATE",
     "type": "json_flag",

data/json/furniture_and_terrain/terrain-floors-indoor.json

@@ -367,6 +367,7 @@
     "color": "magenta",
     "connects_to": "ROCKFLOOR",
     "move_cost": 2,
+    "roof": "t_warped_roof",
     "flags": [ "TRANSPARENT", "INDOORS", "SUPPORTS_ROOF", "FLAT", "ROAD" ]
   },
   {

data/json/furniture_and_terrain/terrain-roofs.json

@@ -334,6 +334,16 @@
       "bash_below": true
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_warped_roof",
+    "name": "warped roof",
+    "description": "A section of flat stone like roof.  It's pattern of grooves and lines is constantly shifting.",
+    "symbol": ".",
+    "color": "magenta",
+    "move_cost": 2,
+    "flags": [ "FLAT" ]
+  },
   {
     "type": "terrain",
     "id": "t_roof_paper",

data/json/harvest.json

@@ -355,13 +355,13 @@
       {
         "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
-        "flags": [ "NO_STERILE", "NO_PACKED" ],
+        "flags": [ "NO_STERILE", "NO_PACKED", "FILTHY" ],
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
         "drop": "Zomborg_CBM_harvest_power",
         "type": "bionic_group",
-        "flags": [ "NO_STERILE", "NO_PACKED" ],
+        "flags": [ "NO_STERILE", "NO_PACKED", "FILTHY" ],
         "faults": [ "fault_bionic_salvaged" ]
       },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 },

data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json

@@ -85,7 +85,6 @@
       [ "antiparasitic", 100 ],
       [ "diazepam", 100 ],
       [ "calcium_tablet", 100 ],
-      [ "inj_vitb", 100 ],
       [ "inj_iron", 100 ],
       [ "prozac", 100 ],
       [ "thorazine", 100 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -1654,6 +1654,7 @@
       { "item": "portable_game", "prob": 65, "charges": 100 },
       { "item": "cell_phone", "prob": 11, "charges": 150 },
       { "item": "smart_phone", "prob": 85, "charges": 120 },
+      { "item": "waterproof_smart_phone_case", "prob": 40 },
       { "item": "mp3", "prob": 65, "charges": 100 },
       { "group": "toy_radio_car", "prob": 35 },
       { "group": "toy_makerspace_kit", "prob": 25 },

data/json/itemgroups/collections_domestic.json

@@ -420,6 +420,7 @@
       { "group": "alcohol", "prob": 163 },
       { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 36, "charges-min": 0 },
+      { "item": "waterproof_smart_phone_case", "prob": 5 },
       { "item": "wristwatch", "prob": 15 },
       { "item": "pocketwatch", "prob": 5 },
       { "item": "umbrella", "prob": 50 },

data/json/itemgroups/electronics.json

@@ -34,6 +34,7 @@
       [ "battery_ups", 15 ],
       { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 31, "charges-min": 0 },
+      { "item": "waterproof_smart_phone_case", "prob": 11 },
       { "item": "eink_tablet_pc", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },

data/json/items/ammo.json

@@ -1178,6 +1178,50 @@
     "ammo_type": "components",
     "count": 150
   },
+  {
+    "type": "AMMO",
+    "id": "lc_chain_link",
+    "category": "spare_parts",
+    "price": 150,
+    "price_postapoc": 50,
+    "name": { "str": "mild steel chain link" },
+    "symbol": "=",
+    "color": "light_gray",
+    "description": "Small metal rings, suitable for constructing chainmail.",
+    "material": [ "lc_steel" ],
+    "volume": "250 ml",
+    "weight": "1 g",
+    "ammo_type": "components",
+    "count": 150
+  },
+  {
+    "type": "AMMO",
+    "id": "mc_chain_link",
+    "copy-from": "lc_chain_link",
+    "name": { "str": "medium steel chain link" },
+    "material": [ "mc_steel" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "hc_chain_link",
+    "copy-from": "lc_chain_link",
+    "name": { "str": "high steel chain link" },
+    "material": [ "hc_steel" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "ch_chain_link",
+    "copy-from": "lc_chain_link",
+    "name": { "str": "hardened steel chain link" },
+    "material": [ "ch_steel" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "qt_chain_link",
+    "copy-from": "lc_chain_link",
+    "name": { "str": "tempered steel chain link" },
+    "material": [ "qt_steel" ]
+  },
   {
     "type": "AMMO",
     "id": "nitrox",