YACM

.github/labeler.yml

@@ -11,21 +11,39 @@
 "<Documentation>":
   - "**/*.md"
   - doc/**/*
+  - doxygen_doc/**/*
 
 "Code: Tooling":
   - tools/**/*
+  - .github/**/*
+  - utilities/**/*
 
 "Code: Tests":
   - tests/**/*
 
+"Code: Build":
+  - build-data/**/*
+  - build-scripts/**/*
+  - "**/Makefile"
+  - "**/CMakeLists.txt"
+  - "**/*.cmake"
+
 "NPC / Factions":
   - data/json/npcs/**/*
 
+"Monsters":
+  - data/json/monsters/**/*
+
+"Spawn":
+  - data/json/itemgroups/**/*
+  - data/json/monstergroups/**/*
+
 "Bionics":
   - "data/json/bionics.json"
 
 "Player Faction Base / Camp":
   - "src/basecamp.(cpp|h)"
+  - "src/faction_camp.(cpp|h)"
   - data/json/mapgen/basecamps/**/*
 
 "Items: Ammo / Guns":

.github/pull_request_template.md

@@ -10,7 +10,9 @@ NOTE: Please grant permission for repository maintainers to edit your PR.  It is
 #### Summary
 Category "Brief description"
 <!-- This section should consist of exactly one line, edit the one above.
-Category must be one of these: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N. Or replace the whole line with just the word None for no changelog entry.
+1. Replace the word "Category" with one of these words: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.
+2. Replace the text inside the quotes with a brief description of your changes.
+Or if you don't want a changelog entry, replace the whole line with just the word "None" (with no quotes).
 For more on the meaning of each category, see:
 https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md
 If approved and merged, your summary will be added to the project changelog:

data/changelog.txt

@@ -107,7 +107,7 @@ Custom achievement/conduct requirement descriptions.
 Enables mouse input for inventory.
 Worn gloves count as unarmed weapons when no weapon is held.
 Any corpse can rise again as a zombie.
-Added to autodocs the ability to stop bleeding, disinfect wounds, and inject antibiotics in case of infected wounds or tetanus.
+Added to Autodocs the ability to stop bleeding, disinfect wounds, and inject antibiotics in case of infected wounds or tetanus.
 Allow randomizing scenario and profession in new character menu.
 Adds actions to workout and do exercises.
 Vehicles: ground vehicle z-level transitions and z+1 bridges.
@@ -129,7 +129,7 @@ Allows customizing initial date in scenarios.
 Allows nanofabricator templates to contain recipes from any item group.
 Adds different bleeding types for different species.
 Adds bleeding butchery action.
-Adds autodoc installation programs that almost guarantee flawless installation of supported bionics.
+Adds Autodoc installation programs that almost guarantee flawless installation of supported bionics.
 Removes the obsolete 'carrion spawn rate scaling factor' world configuration option.
 Makes thrown glass items drop glass shards when shattered.
 Adds suspension for butchering using cranes (except tiny ones) and forklift arms.
@@ -197,10 +197,10 @@ Shows weariness and activity levels in sidebar panels.
 Warns before crafting armor or clothing you won't be able to wear.
 
 ## Mods:
-[Aftershock] Adds autodoc tiers and augmentation clinics.
+[Aftershock] Adds Autodoc tiers and augmentation clinics.
 [Aftershock] Megacity-oriented overmap generation adjustments
 [Aftershock] Adds new Melee oriented bionics.
-[Aftershock] Replaces Vanilla autodocs with Aftershock Average Autodocs.
+[Aftershock] Replaces Vanilla Autodocs with Aftershock Average Autodocs.
 [Aftershock] Adds an astrobiology lab.
 [Aftershock] Adds a design document.
 [Aftershock] Adds new laser and plasma pistols.
@@ -256,7 +256,7 @@ Ankle storage items don't affect feet-related mutations anymore.
 Gives the default Survivor profession more weather-appropriate clothes for the default start.
 Eating raw meat does not hurt your morale as much if you have traits like Hunter or Predator.
 Very-fast-moving zombie animals only attack once per turn.
-Spawns anesthesia supplies in autodocs.
+Spawns anesthesia supplies in Autodocs.
 Rebalances spawn rates for overmap specials.
 Mycus Fireproofing now also gives heat immunity.
 Tweaks Infection impact by lowering fatigue drain and removing pain.
@@ -670,7 +670,7 @@ Implement blackpowder fouling mechanics.
 Allow items to use multiple ammotypes.
 Tell an NPC to finish your construction tasks.
 NPC will say what their current activity is + some infrastructure.
-Added ability to splint broken limbs to autodoc.
+Added ability to splint broken limbs to Autodoc.
 Factions: start to implement useful faction relationship API.
 Riding animals and animal-pulled vehicles.
 Faction ownership of vehicles.
@@ -1655,7 +1655,7 @@ Separated dashboard (electronics controls) from steering.
 Acidic Ant Expansion - Acidic Chitin Item & Equipment.
 Add engine blocks and engine deconstruction recipes.
 Butchering yields for fungal towers and other structures.
-New basement variant, with and without hidden autodoc.
+New basement variant, with and without hidden Autodoc.
 Disposable filters for filter, gas, PBA, and survivor masks, as well as filters for hazmat and ANBC suits.
 Adds new narcosis effect that Characters cannot be prematurely woken from.
 Replaces heavy sticks with long sticks in many recipes.
@@ -2032,7 +2032,7 @@ Add "Mutant NPCs" mod.
 Mundane Zombies Mod Revival.
 Manual CBM installation moved to Bright Nights mod.
 Allow adding contents to existing monster groups in JSON.
-Safe autodoc mod, a dependency of Bright Nights.
+Safe Autodoc mod, a dependency of Bright Nights.
 Makes Crazy Cataclysm a little crazier.
 Nested mapgen structures.
 Added Fuji's Struct mod.

data/json/ascii_art/generic_ascii.json

@@ -741,6 +741,30 @@
       "                                         "
     ]
   },
+  {
+    "type": "ascii_art",
+    "id": "bucket_wood",
+    "picture": [
+      "                                         ",
+      "    <color_light_gray>/▀▀▀</color><color_brown>▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</color><color_light_gray>▀▀▀\\              ",
+      "   //                     \\\\             ",
+      "  //                       \\\\            ",
+      " ▐█                         █▌           ",
+      " ▐▀    </color><color_white>░░░░░░░░░░░░░░░░░    </color><color_light_gray>▀▌           ",
+      " ▐ </color><color_white>░░░░</color><color_dark_gray>░░░░░░░░░░░░░░░░░</color><color_white>░░░░ </color><color_light_gray>▌           ",
+      " </color><color_white>╘▓</color><color_dark_gray>░░░░░░░░░░░░░░░░░░░░░░░░░</color><color_white>▓╛           ",
+      "   ▓▓▓▓</color><color_dark_gray>░░░░░░░░░░░░░░░░░</color><color_white>▓▓▓▓             ",
+      "   </color><color_light_gray>▒▒▒▒</color><color_white>▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓</color><color_brown>▒▒█             ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "   </color><color_light_gray>▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒</color><color_brown>            ",
+      "   ▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒█▒▒▒▒▒            ",
+      "                                        "
+    ]
+  },
   {
     "type": "ascii_art",
     "id": "crude_picklock",

data/json/body_parts.json

@@ -29,7 +29,7 @@
     "drench_capacity": 4000,
     "smash_message": "You smash the %s with a powerful shoulder-check.",
     "bionic_slots": 80,
-    "sub_parts": [ "torso_upper", "torso_neck", "torso_lower", "torso_hanging_front", "torso_hanging_back" ]
+    "sub_parts": [ "torso_upper", "torso_neck", "torso_lower", "torso_hanging_front", "torso_hanging_back", "torso_waist" ]
   },
   {
     "id": "head",
@@ -444,7 +444,7 @@
   {
     "id": "torso_hanging_front",
     "type": "sub_body_part",
-    "max_coverage": 40,
+    "max_coverage": 35,
     "parent": "torso",
     "secondary": true,
     "side": 0,
@@ -455,14 +455,24 @@
   {
     "id": "torso_hanging_back",
     "type": "sub_body_part",
-    "max_coverage": 50,
+    "max_coverage": 45,
     "parent": "torso",
     "secondary": true,
     "side": 0,
     "name": "item hangs off your back",
     "opposite": "torso_hanging_front",
     "name_multiple": "item hangs off you"
   },
+  {
+    "id": "torso_waist",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "torso",
+    "secondary": true,
+    "side": 0,
+    "name": "waist",
+    "opposite": "sub_limb_debug"
+  },
   {
     "id": "arm_shoulder_r",
     "type": "sub_body_part",

data/json/construction.json

@@ -1951,7 +1951,7 @@
     "time": "60 m",
     "qualities": [ [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 2 } ] ],
     "components": [ [ [ "rock", 20 ], [ "2x4", 2 ] ] ],
-    "pre_flags": "DIGGABLE",
+    "pre_flags": { "flag": "DIGGABLE", "force_terrain": true },
     "pre_terrain": "f_coffin_c",
     "post_flags": [ "keep_items" ],
     "post_terrain": "t_grave_new",
@@ -2444,6 +2444,22 @@
     "pre_terrain": "t_covered_well",
     "post_terrain": "t_water_pump"
   },
+  {
+    "type": "construction",
+    "id": "constr_wooden_well",
+    "group": "build_water_well",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 4 ], [ "survival", 4 ] ],
+    "time": "120 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [
+      [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ],
+      [ [ "bucket", 1 ], [ "bucket_wood", 1 ] ],
+      [ [ "2x4", 4 ], [ "stick", 4 ] ]
+    ],
+    "pre_terrain": "t_covered_well",
+    "post_terrain": "t_wooden_well"
+  },
   {
     "type": "construction",
     "id": "constr_hay",
@@ -3104,6 +3120,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_freezer",
+    "group": "place_freezer",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "freezer", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "app_minifreezer",

data/json/construction_group.json

@@ -1109,6 +1109,11 @@
     "id": "place_minifridge",
     "name": "Place Minifridge"
   },
+  {
+    "type": "construction_group",
+    "id": "place_freezer",
+    "name": "Place Freezer"
+  },
   {
     "type": "construction_group",
     "id": "place_minifreezer",

data/json/dreams.json

@@ -652,7 +652,8 @@
     "type": "dream",
     "messages": [
       "You wonder if you could find one of those 'salmon runs', or if they were just a legend…",
-      "Ah, the wolf-slaying dream again.  That's a good one…"
+      "Ah, the wolf-slaying dream again.  That's a good one…",
+      "In the dream, you fatten yourself up with all the food you can find to prepare for your next winter hibernation."
     ],
     "category": "URSINE",
     "strength": 4
@@ -661,7 +662,10 @@
     "type": "dream",
     "messages": [
       "Boing!  and you've pounced another yummy critter.",
-      "Your nightmare of sentient rats turns successful, as you grab their King and shake it apart!"
+      "Your nightmare of sentient rats turns successful, as you grab their King and shake it apart!",
+      "You leap from rooftop to rooftop, effortlessly avoiding your pursuers while making your way to safety.",
+      "You sneak into a house, only to discover a full, intact cupboard of canned tuna!",
+      "You dream of a whole field where only lush catnip grows, and you blissfully roll around in it."
     ],
     "category": "FELINE",
     "strength": 4
@@ -671,7 +675,10 @@
     "messages": [
       "You dream of the hunt, the feed, and your pack.",
       "You lead the pack on a glorious hunt, knowing that they will all have your back as you have theirs!",
-      "Oh, you should really patrol your territory again, maybe expand."
+      "Oh, you should really patrol your territory again, maybe expand.",
+      "You dream of a rival pack of hairless bipeds intruding upon your territory.  After a fierce battle, their leader lays lifeless on the ground.",
+      "You howl loud and long, ecstatic after securing a whole cache of supplies.",
+      "After recruiting a new packmate, you expand your spacious den to accommodate them."
     ],
     "category": "LUPINE",
     "strength": 4

data/json/effect_on_condition.json

@@ -323,7 +323,7 @@
     "id": "EOC_DEATH_SWITCH",
     "type": "effect_on_condition",
     "eoc_type": "AVATAR_DEATH",
-    "condition": { "and": [ { "npc_allies": 1 }, { "u_query": "You have died. Continue as one of your followers?", "default": false } ] },
+    "condition": { "u_query": "You have died. Continue as one of your followers?", "default": false },
     "effect": [ "take_control_menu" ]
   },
   {

data/json/effects.json

@@ -2093,6 +2093,15 @@
     "max_intensity": 3,
     "part_descs": true
   },
+  {
+    "type": "effect_type",
+    "id": "chafing",
+    "name": [ "Uncomfortable" ],
+    "desc": [ "Your %s is uncomfortable.  Wearing something soft under your hard armor would help" ],
+    "max_intensity": 1,
+    "part_descs": true,
+    "base_mods": { "speed_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 2 ], "pain_max_val": [ -1 ] }
+  },
   {
     "type": "effect_type",
     "id": "hot",

data/json/flags.json

@@ -588,6 +588,11 @@
     "type": "json_flag",
     "info": "This item can be worn, but it <neutral>won't provide any effects</neutral>."
   },
+  {
+    "id": "PADDED",
+    "type": "json_flag",
+    "info": "This item has notable padding and will be comfortable worn without clothing under it."
+  },
   {
     "id": "PALS_SMALL",
     "type": "json_flag",

data/json/furniture_and_terrain/appliances.json

@@ -43,6 +43,43 @@
     "flags": [ "CARGO", "OBSTACLE", "FRIDGE", "COVERED", "ENABLED_DRAINS_EPOWER", "APPLIANCE", "CTRL_ELECTRONIC" ],
     "copy-from": "minifridge"
   },
+  {
+    "type": "vehicle_part",
+    "id": "ap_freezer",
+    "name": { "str": "freezer" },
+    "symbol": "H",
+    "categories": [ "cargo" ],
+    "color": "blue",
+    "broken_symbol": "#",
+    "broken_color": "blue",
+    "location": "structure",
+    "damage_modifier": 80,
+    "durability": 100,
+    "description": "A chest freezer.  When turned on, it will freeze and preserve the food inside.",
+    "epower": -35,
+    "size": 1800,
+    "item": "freezer",
+    "requirements": {
+      "repair": {
+        "skills": [ [ "mechanics", 4 ] ],
+        "time": "60 m",
+        "using": [ [ "repair_welding_standard", 3 ], [ "soldering_standard", 5 ] ]
+      }
+    },
+    "flags": [ "CARGO", "OBSTACLE", "FREEZER", "COVERED", "ENABLED_DRAINS_EPOWER", "APPLIANCE", "CTRL_ELECTRONIC" ],
+    "breaks_into": [
+      { "item": "sheet_metal", "count": [ 1, 4 ] },
+      { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 0, 3 ] },
+      { "item": "scrap", "count": [ 2, 8 ] },
+      { "item": "cable", "charges": [ 1, 2 ] },
+      { "item": "pipe_fittings", "count": [ 1, 3 ] },
+      { "item": "hose", "count": 1 },
+      { "item": "cu_pipe", "count": [ 2, 4 ] },
+      { "item": "scrap_copper", "count": [ 1, 2 ] }
+    ],
+    "damage_reduction": { "all": 32 }
+  },
   {
     "type": "vehicle_part",
     "id": "ap_minifreezer",

data/json/furniture_and_terrain/furniture-alien.json

@@ -151,7 +151,7 @@
     "type": "furniture",
     "id": "f_alien_table",
     "name": "fleshy altar",
-    "description": "This pulsing protuberance juts from the floor, its sides covered in scaled, oozing skin.  The surface is flat, but undulates softly.  A handful of unidentifiable appendages reach from the sides, suggesting a sort of nightmarish living autodoc.",
+    "description": "This pulsing protuberance juts from the floor, its sides covered in scaled, oozing skin.  The surface is flat, but undulates softly.  A handful of unidentifiable appendages reach from the sides, suggesting a sort of nightmarish living Autodoc.",
     "symbol": "n",
     "color": "pink",
     "move_cost_mod": -1,