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

.github/labeler.yml

@@ -38,12 +38,29 @@
 "NPC / Factions":
   - "**/npcs/**/*"
 
+"Info / User Interface":
+  - "**/ui/**/*"
+  - "**/widget/**/*"
+  - "src/list_view.*"
+  - "src/surroundings_menu.*"
+
 "Appliance/Power Grid":
   - "**/appliance**"
 
 "Monsters":
   - "**/monsters/**/*"
 
+"Lore":
+  - data/json/npcs/BG_trait_groups.json
+  - data/json/npcs/Personality_trait_groups.json
+  - data/json/npcs/personality_traits.json
+  - "**/Backgrounds/**/*"
+  - "**/snippets/**/*"
+
+"Limbs":
+  - "src/bodypart.*"
+  - "data/json/limb_scores.json"
+
 "Spawn":
   - "**/itemgroups/**/*"
   - "**/monstergroups/**/*"
@@ -71,6 +88,7 @@
 
 "Translation":
   - lang/**/*
+  - "src/translation.*"
 
 "Mods: Aftershock":
   - data/mods/Aftershock/**/*

data/json/construction.json

@@ -3210,6 +3210,83 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_drill_press",
+    "group": "place_drill_press",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "drill_press", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_tablesaw",
+    "group": "place_tablesaw",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "tablesaw", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_mitresaw",
+    "group": "place_mitresaw",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "mitresaw", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_bandsaw",
+    "group": "place_bandsaw",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "bandsaw", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_router",
+    "group": "place_router",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "router", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_planer",
+    "group": "place_planer",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "planer", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
+  {
+    "type": "construction",
+    "id": "app_jointer",
+    "group": "place_jointer",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "jointer", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "app_solar",

data/json/construction_group.json

@@ -1149,6 +1149,41 @@
     "id": "place_kiln",
     "name": "Place Kiln"
   },
+  {
+    "type": "construction_group",
+    "id": "place_drill_press",
+    "name": "Place Drill Press"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_tablesaw",
+    "name": "Place Table Saw"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_mitresaw",
+    "name": "Place Mitre Saw"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_bandsaw",
+    "name": "Place Band Saw"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_router",
+    "name": "Place Router"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_planer",
+    "name": "Place Planer"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_jointer",
+    "name": "Place Jointer"
+  },
   {
     "type": "construction_group",
     "id": "place_heater_large",

data/json/furniture_and_terrain/appliances.json

@@ -166,6 +166,195 @@
     "item": "kiln",
     "copy-from": "veh_kiln"
   },
+  {
+    "type": "vehicle_part",
+    "id": "ap_drill_press",
+    "name": { "str": "drill press" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_red",
+    "categories": [ "utility" ],
+    "description": "A powerful drill mounted on a slide that lets it drop precisely down.  Useful in all kinds of projects from industrial fabrication to home woodworking.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_red",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "drill_press_tool" } ],
+    "epower": 0,
+    "item": "drill_press",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_tablesaw",
+    "name": { "str": "table saw" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_red",
+    "categories": [ "utility" ],
+    "description": "A rotating sawblade set into a large flat table, for making straight measured cuts, a key tool in any carpenter's arsenal.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_red",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "tablesaw_tool" } ],
+    "epower": 0,
+    "item": "tablesaw",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_mitresaw",
+    "name": { "str": "mitre saw" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_cyan",
+    "categories": [ "utility" ],
+    "description": "A circular sawblade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_cyan",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "mitresaw_tool" } ],
+    "epower": 0,
+    "item": "mitresaw",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_bandsaw",
+    "name": { "str": "band saw" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_cyan",
+    "categories": [ "utility" ],
+    "description": "A circular sawblade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_cyan",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "bandsaw_tool" } ],
+    "epower": 0,
+    "item": "bandsaw",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_router",
+    "name": { "str": "router" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_green",
+    "categories": [ "utility" ],
+    "description": "This table has an inset router, a rotating motor with an exchangeable blade head for cutting specific profiles and grooves and stuff.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_green",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "router_tool" } ],
+    "epower": 0,
+    "item": "router",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_planer",
+    "name": { "str": "planer" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_white",
+    "categories": [ "utility" ],
+    "description": "A hefty tool that will take in a board and cut it smooth and flat to a specific width, particularly great if working with raw lumber stock, but also good just for shaving wood down to size.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_white",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "planer_tool" } ],
+    "epower": 0,
+    "item": "planer",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_jointer",
+    "name": { "str": "jointer" },
+    "looks_like": "f_machinery_light",
+    "symbol": "7",
+    "color": "yellow_magenta",
+    "categories": [ "utility" ],
+    "description": "A table-shaped tool with a rotating blade that will cut down, smooth out, and square off a board to make it very smooth and nice indeed.  Ready to be plugged in.",
+    "location": "structure",
+    "broken_color": "yellow_magenta",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "jointer_tool" } ],
+    "epower": 0,
+    "item": "jointer",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "plastic_chunk", "count": [ 4, 10 ] },
+      { "item": "steel_plate", "count": [ 2, 4 ] }
+    ]
+  },
   {
     "type": "vehicle_part",
     "id": "ap_heater_large",