Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

.github/workflows/release.yml

@@ -178,16 +178,14 @@ jobs:
           mv cataclysmdda-0.F.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
-        env:
-          USE_HOME_DIR: 1
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
           build number: ${{ needs.release.outputs.timestamp }}
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.12 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'

data/json/bionics.json

@@ -706,6 +706,7 @@
     "description": "Much of the material in your inner eye has been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any vision problems you might have had are now gone.",
     "occupied_bodyparts": [ [ "eyes", 2 ] ],
     "flags": [ "ENHANCED_VISION" ],
+    "cant_remove_reason": "The Telescopic Lenses are part of %1$s eyes now.  Removing them would leave %2$s blind.",
     "canceled_mutations": [
       "HYPEROPIC",
       "MYOPIC",

data/json/flags.json

@@ -10,6 +10,11 @@
     "type": "json_flag",
     "context": [  ]
   },
+  {
+    "id": "ALLOWS_TALONS",
+    "type": "json_flag",
+    "context": [  ]
+  },
   {
     "id": "ALARMCLOCK",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-emitters.json

@@ -28,5 +28,100 @@
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
     "emissions": [ "emit_fog_plume" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_cold_air2_stream",
+    "name": "metal grate",
+    "description": "This is a metal vent, you can feel cool air seeping out of it.",
+    "looks_like": "t_grate",
+    "symbol": "~",
+    "color": "blue",
+    "move_cost_mod": 0,
+    "coverage": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT" ],
+    "emissions": [ "emit_cold_air2_stream" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_cold_air2_blast",
+    "description": "This is a metal vent, you can feel cold air blasting out of it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "blue",
+    "emissions": [ "emit_cold_air2_blast" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_hot_air2_stream",
+    "description": "This is a metal vent, you can feel hot air seeping out of it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "red",
+    "emissions": [ "emit_hot_air2_stream" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_hot_air2_blast",
+    "copy-from": "f_vent_cold_air2_stream",
+    "description": "This is a metal vent, you can feel hot air seeping out of it.",
+    "symbol": "~",
+    "color": "red",
+    "emissions": [ "emit_hot_air2_blast" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_smoke_plume",
+    "description": "This is a metal vent, you can see smoke seeping from it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "white",
+    "emissions": [ "emit_smoke_plume" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_smoke_stream",
+    "description": "This is a metal vent, you can see smoke streaming out of it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "white",
+    "emissions": [ "emit_smoke_stream" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_toxic_leak",
+    "description": "This is a metal vent, toxic looking clouds seep from it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "green",
+    "emissions": [ "emit_toxic_leak" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_toxic_belch",
+    "description": "This is a metal vent, toxic looking clouds emerge from it.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "green",
+    "emissions": [ "emit_toxic_belch" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_rad_leak",
+    "description": "This is a metal vent.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "green",
+    "emissions": [ "emit_rad_leak" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_vent_rad_cloud",
+    "description": "This is a metal vent.",
+    "copy-from": "f_vent_cold_air2_stream",
+    "symbol": "~",
+    "color": "green",
+    "emissions": [ "emit_rad_cloud" ]
   }
 ]

data/json/harvest.json

@@ -1490,6 +1490,18 @@
       { "drop": "venom_paralytic", "type": "offal", "mass_ratio": 0.0075 }
     ]
   },
+  {
+    "id": "triffid_fungal_fighter",
+    "type": "harvest",
+    "entries": [
+      { "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.4 },
+      { "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 },
+      { "drop": "veggy", "type": "offal", "mass_ratio": 0.05 },
+      { "drop": "stick", "type": "bone", "mass_ratio": 0.05 },
+      { "drop": "venom_paralytic", "type": "offal", "mass_ratio": 0.0075 },
+      { "drop": "triffid_fungicide", "type": "offal", "mass_ratio": 0.0075 }
+    ]
+  },
   {
     "id": "triffid_queen",
     "type": "harvest",

data/json/item_spell_effects.json

@@ -63,5 +63,22 @@
     "min_duration": 18000,
     "max_duration": 18000,
     "damage_type": "cold"
+  },
+  {
+    "id": "spice_pain",
+    "type": "SPELL",
+    "name": { "str": "spice pain" },
+    "description": "Causes pain from eating spicy food.",
+    "valid_targets": [ "self" ],
+    "flags": [ "SILENT" ],
+    "min_damage": -2,
+    "max_damage": -200,
+    "damage_increment": -2.0,
+    "max_level": 100,
+    "//": "Spicier dishes might be added in the future so the spell is ready for them.",
+    "message": "Spicy!",
+    "shape": "blast",
+    "effect": "recover_energy",
+    "effect_str": "PAIN"
   }
 ]

data/json/itemgroups/Labs/labs_common.json

@@ -0,0 +1,41 @@
+[
+  {
+    "id": "lab_glassware",
+    "type": "item_group",
+    "subtype": "collection",
+    "items": [
+      { "item": "test_tube", "prob": 50, "count": [ 2, 6 ] },
+      { "item": "glass_prism", "prob": 5, "count": [ 1, 3 ] },
+      { "item": "bottle_glass", "prob": 20, "count": [ 1, 3 ] },
+      { "item": "glass_tube_small", "prob": 40, "count": [ 1, 6 ] },
+      { "item": "flask_glass", "prob": 60, "count": [ 1, 6 ] },
+      { "item": "canister_empty", "prob": 40, "count": [ 1, 6 ] },
+      { "item": "jar_3l_glass_sealed", "prob": 5, "count": [ 1, 3 ] }
+    ]
+  },
+  {
+    "id": "ID_supplies",
+    "type": "item_group",
+    "subtype": "collection",
+    "items": [
+      {
+        "distribution": [
+          { "item": "camera", "prob": 70, "charges-min": 0, "charges-max": 50 },
+          { "item": "camera_pro", "prob": 30, "charges-min": 0, "charges-max": 50 }
+        ],
+        "prob": 10
+      },
+      { "item": "mobile_memory_card", "prob": 50, "count": [ 2, 6 ] },
+      { "item": "mobile_memory_card_encrypted", "prob": 5, "count": [ 1, 3 ] },
+      { "item": "id_science", "prob": 5, "count": [ 1, 3 ] },
+      { "item": "badge_doctor", "prob": 5, "count": [ 1, 3 ] },
+      { "item": "wrapped_rad_badge", "prob": 7, "count": [ 1, 3 ] },
+      { "item": "plastic_chunk", "prob": 30, "count": [ 1, 3 ] },
+      { "item": "vac_sealer", "prob": 20 },
+      { "item": "id_military", "prob": 1 },
+      { "item": "lanyard", "prob": 100, "count": [ 1, 6 ] },
+      { "item": "canister_empty", "prob": 30, "count": [ 1, 6 ] },
+      { "item": "string_36", "prob": 60, "count": [ 1, 3 ] }
+    ]
+  }
+]

data/json/itemgroups/Labs/labs_mutagen.json

@@ -0,0 +1,51 @@
+[
+  {
+    "id": "lab_mutagen_ingredients",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "bleach", "charges-min": 1, "prob": 40, "container-item": "jug_plastic", "sealed": false },
+      { "item": "ammonia", "charges-min": 1, "prob": 40, "container-item": "jug_plastic", "sealed": false },
+      {
+        "distribution": [ { "item": "honey_glassed", "prob": 20 }, { "item": "honey_bottled", "prob": 80 } ],
+        "prob": 30
+      },
+      { "item": "can_clams", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "lye_powder", "prob": 30 },
+      { "item": "honeycomb", "prob": 30 },
+      { "item": "iodine", "prob": 30 },
+      { "item": "disinfectant", "prob": 30 },
+      { "item": "protein_powder", "prob": 30 },
+      { "item": "bee_sting", "prob": 20 },
+      { "item": "slime_scrap", "prob": 20 },
+      { "item": "datura_seed", "prob": 20 },
+      { "item": "chitin_piece", "prob": 20 },
+      { "item": "oxy_powder", "prob": 30 },
+      { "item": "heroin", "prob": 10 },
+      { "item": "lsd", "prob": 10 },
+      { "item": "oxycodone", "prob": 10 },
+      { "item": "tramadol", "prob": 10 },
+      { "item": "codeine", "prob": 10 },
+      { "item": "thorazine", "prob": 10 },
+      { "item": "pills_sleep", "prob": 20 },
+      { "item": "vitamins", "prob": 30 }
+    ]
+  },
+  {
+    "id": "lab_mutagen_ingredients_fridge",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "meat", "prob": 40, "count": [ 1, 3 ] },
+      { "item": "meat_tainted", "prob": 30, "count": [ 1, 3 ] },
+      { "item": "tallow", "prob": 30, "count": [ 1, 3 ] },
+      { "item": "fish", "prob": 40, "count": [ 1, 3 ] },
+      { "item": "tallow_tainted", "prob": 20, "count": [ 1, 2 ] },
+      { "item": "egg_bird_unfert", "prob": 30, "count-min": 1, "count-max": 12 },
+      { "item": "spider_egg", "prob": 20, "count-min": 1, "count-max": 12 },
+      { "item": "egg_reptile", "prob": 20, "count-min": 1, "count-max": 12 },
+      { "item": "water_clean", "container-item": "bottle_plastic", "prob": 65, "count": [ 1, 3 ], "sealed": false },
+      { "item": "water_mineral", "container-item": "bottle_plastic", "prob": 35, "count": [ 1, 2 ], "sealed": false }
+    ]
+  }
+]

data/json/itemgroups/SUS/domestic.json

@@ -581,7 +581,13 @@
         "prob": 65
       },
       {
-        "distribution": [ { "item": "pot", "prob": 20 }, { "item": "pot_copper", "prob": 5 }, { "item": "iron_pot", "prob": 5 } ],
+        "distribution": [
+          { "item": "pot", "prob": 20 },
+          { "item": "tuna_noodle_casserole", "charges": 8, "container-item": "casserole", "prob": 10 },
+          { "item": "hot_corn_casserole", "charges": 8, "container-item": "casserole", "prob": 10 },
+          { "item": "pot_copper", "prob": 5 },
+          { "item": "iron_pot", "prob": 5 }
+        ],
         "prob": 25
       },
       {

data/json/itemgroups/SUS/library.json

@@ -303,6 +303,9 @@
       { "item": "book_fict_soft_pulp_flashcc", "prob": 2 },
       { "item": "book_fict_soft_pulp_gcapes", "prob": 2 },
       { "item": "book_fict_soft_pulp_yesmurd", "prob": 2 },
+      { "item": "book_anthology_sst", "prob": 2 },
+      { "item": "book_anthology_bk", "prob": 2 },
+      { "item": "book_anthology_cw", "prob": 2 },
       { "item": "novel_pulp", "prob": 1 }
     ]
   },
@@ -338,6 +341,10 @@
       { "item": "book_fict_soft_scifi_dune", "prob": 1 },
       { "item": "book_fict_soft_scifi_zamwe", "prob": 1 },
       { "item": "book_fict_soft_satire_cats", "prob": 1 },
+      { "item": "book_anthology_htloop", "prob": 1 },
+      { "item": "book_anthology_an", "prob": 1 },
+      { "item": "book_anthology_sunvault", "prob": 1 },
+      { "item": "book_anthology_moataatgb", "prob": 1 },
       { "item": "book_fict_soft_pulp_ddive", "prob": 1 }
     ]
   },

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -6,12 +6,12 @@
     "items": [
       { "item": "glock_17", "prob": 35, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_19", "prob": 50, "charges-min": 0, "charges-max": 15 },
-      { "item": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 15 },
+      { "item": "glock_20", "variant": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_21", "prob": 8, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_22", "prob": 35, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_29", "prob": 2, "charges-min": 0, "charges-max": 10 },
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 15 },
-      { "item": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 15 },
+      { "item": "glock_20", "variant": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 15 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 },
       { "item": "m1911_10", "prob": 15, "charges-min": 0, "charges-max": 7 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 },
@@ -56,9 +56,9 @@
       { "item": "glock_17", "prob": 35, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_19", "prob": 50, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_22", "prob": 35, "charges-min": 0, "charges-max": 0 },
-      { "item": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 0 },
+      { "item": "glock_20", "variant": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_21", "prob": 8, "charges-min": 0, "charges-max": 15 },
-      { "item": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 0 },
+      { "item": "glock_20", "variant": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 0 },
       { "item": "m1911_10", "prob": 15, "charges-min": 0, "charges-max": 0 },

data/json/itemgroups/books.json

@@ -147,7 +147,8 @@
       { "item": "textbook_biodiesel", "prob": 10 },
       { "item": "manual_carpentry", "prob": 10 },
       { "item": "book_icef", "prob": 8 },
-      { "item": "carpentry_book", "prob": 5 }
+      { "item": "carpentry_book", "prob": 5 },
+      { "item": "theater_props", "prob": 2 }
     ]
   },
   {
@@ -288,6 +289,7 @@
       { "item": "cookbook_foodfashions", "prob": 10 },
       { "item": "cookbook_indian", "prob": 10 },
       { "item": "survnote", "prob": 1 },
+      { "item": "theater_props", "prob": 1 },
       { "item": "scots_cookbook", "prob": 8 },
       { "item": "offalcooking", "prob": 2 },
       { "item": "dnd_handbook", "prob": 2 },
@@ -336,7 +338,8 @@
       { "item": "manual_canning", "prob": 18 },
       { "item": "manual_sealing", "prob": 9 },
       { "item": "fermenting_book", "prob": 8 },
-      { "item": "distilling_cookbook", "prob": 8 }
+      { "item": "distilling_cookbook", "prob": 8 },
+      { "item": "theater_props", "prob": 5 }
     ]
   },
   {
@@ -453,7 +456,8 @@
       { "item": "fermenting_book", "prob": 8 },
       { "item": "distilling_cookbook", "prob": 8 },
       { "item": "textbook_arthropod", "prob": 5 },
-      { "item": "textbook_botany", "prob": 5 }
+      { "item": "textbook_botany", "prob": 5 },
+      { "item": "theater_props", "prob": 2 }
     ]
   },
   {

data/json/itemgroups/science_and_tech.json

@@ -49,6 +49,8 @@
       [ "textbook_electronics", 6 ],
       [ "radio_book", 16 ],
       [ "advanced_electronics", 6 ],
+      [ "theater_props", 2 ],
+      [ "vac_mold", 2 ],
       [ "textbook_chemistry", 11 ],
       [ "adv_chemistry", 4 ],
       [ "textbook_firstaid", 6 ],

data/json/itemgroups/shops_trades.json

@@ -7,6 +7,8 @@
       [ "mag_fabrication", 5 ],
       [ "manual_fabrication", 5 ],
       [ "mag_survival", 10 ],
+      [ "theater_props", 2 ],
+      [ "vac_mold", 2 ],
       [ "wax", 30 ],
       [ "straw_pile", 15 ],
       [ "charcoal", 25 ],