Merge remote-tracking branch 'upstream/master'

.github/labeler.yml

@@ -257,6 +257,9 @@
 "Mods: Xedra Evolved":
   - data/mods/Xedra_Evolved/**/*
 
+"Mods: Mind Over Matter":
+  - data/mods/MindOverMatter/**/*
+
 "Mods":
   - any: [ 'data/mods/**' ]
     all: [ '!data/mods/TEST_DATA/**' ]

.github/reviewers.yml

@@ -26,6 +26,8 @@ files:
   'data/mods/Xedra_Evolved/**':
     - Maleclypse
     - GuardianDll
+  'data/mods/MindOverMatter/**':
+    - Standing-Storm
   'data/mods/innawood/**':
     - Light-Wave
   'data/mods/MA/**':

data/json/construction.json

@@ -2406,7 +2406,7 @@
     "category": "FURN",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "5 m",
-    "components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ],
+    "components": [ [ [ "mattress", 1 ] ] ],
     "pre_terrain": "f_bed_frame",
     "post_terrain": "f_bed"
   },
@@ -2418,15 +2418,45 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "70 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
-    "components": [
-      [ [ "2x4", 16 ], [ "wood_panel", 4 ] ],
-      [ [ "2x4", 2 ] ],
-      [ [ "nail", 20 ] ],
-      [ [ "mattress", 1 ], [ "down_mattress", 1 ] ]
-    ],
+    "components": [ [ [ "2x4", 16 ], [ "wood_panel", 4 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 20 ] ], [ [ "mattress", 1 ] ] ],
     "pre_terrain": "f_bed",
     "post_terrain": "f_bunkbed"
   },
+  {
+    "type": "construction",
+    "id": "constr_down_bed_frame",
+    "group": "build_down_bed",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 4 ] ],
+    "time": "55 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_bed_frame"
+  },
+  {
+    "type": "construction",
+    "id": "constr_finish_down_bed",
+    "group": "build_down_bed",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "down_mattress", 1 ] ] ],
+    "pre_terrain": "f_bed_frame",
+    "post_terrain": "f_bed_down"
+  },
+  {
+    "type": "construction",
+    "id": "constr_down_bunkbed",
+    "group": "build_down_bed",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 4 ] ],
+    "time": "70 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "components": [ [ [ "2x4", 16 ], [ "wood_panel", 4 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 20 ] ], [ [ "down_mattress", 1 ] ] ],
+    "pre_terrain": "f_bed_down",
+    "post_terrain": "f_bunkbed_down"
+  },
   {
     "type": "construction",
     "id": "constr_armchair",

data/json/construction_group.json

@@ -64,6 +64,11 @@
     "id": "build_bed",
     "name": "Build Bed/Bunk bed"
   },
+  {
+    "type": "construction_group",
+    "id": "build_down_bed",
+    "name": "Build Down Bed/Bunk bed"
+  },
   {
     "type": "construction_group",
     "id": "build_bookcase",

data/json/flags.json

@@ -2193,6 +2193,11 @@
     "type": "json_flag",
     "info": "ID card granting access to the crashing ship's exobay."
   },
+  {
+    "id": "PAPER_SHAPED",
+    "type": "json_flag",
+    "restriction": "Item must be shaped like paper"
+  },
   {
     "id": "CREDIT_CARD_SHAPED",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-sleep.json

@@ -59,6 +59,68 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_bed_down",
+    "name": "down bed",
+    "symbol": "0",
+    "description": "A down mattress on a sturdy wooden frame.  Even without blankets or pillows, and despite being a completely ordinary mattress, it's a sight for sore, tired eyes.",
+    "color": "magenta",
+    "move_cost_mod": 3,
+    "coverage": 40,
+    "comfort": 5,
+    "floor_bedding_warmth": 1000,
+    "required_str": -1,
+    "deconstruct": { "items": [ { "item": "down_mattress", "count": 1 } ], "furn_set": "f_bed_frame" },
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 12,
+      "str_max": 40,
+      "sound": "crunch!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 5, 8 ] },
+        { "item": "nail", "charges": [ 6, 8 ] },
+        { "item": "splinter", "count": [ 3, 6 ] },
+        { "item": "cotton_patchwork", "count": [ 10, 15 ] },
+        { "item": "down_feather", "count": [ 45, 55 ] },
+        { "item": "scrap", "count": [ 10, 20 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_bunkbed_down",
+    "name": "down bunkbed",
+    "symbol": "0",
+    "looks_like": "f_bed_down",
+    "description": "A bunk bed with a sturdy wooden frame built to hold two single-person mattresses above one another.  While these usually mean sleeping closer than you'd like to somebody you wouldn't normally want to share a mattress with, a bed's a bed.  This one has two down mattresses.",
+    "color": "magenta",
+    "move_cost_mod": 6,
+    "coverage": 40,
+    "comfort": 5,
+    "floor_bedding_warmth": 1000,
+    "required_str": -1,
+    "deconstruct": {
+      "items": [ { "item": "down_mattress", "count": 1 }, { "item": "2x4", "count": 16 }, { "item": "nail", "charges": [ 10, 20 ] } ],
+      "furn_set": "f_bed_down"
+    },
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "CAN_SIT" ],
+    "bash": {
+      "str_min": 12,
+      "str_max": 40,
+      "sound": "crunch!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 8, 15 ] },
+        { "item": "nail", "charges": [ 15, 20 ] },
+        { "item": "splinter", "count": [ 8, 15 ] },
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] },
+        { "item": "down_feather", "count": [ 90, 110 ] },
+        { "item": "scrap", "count": [ 20, 40 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_triple_bunkbed",
@@ -163,7 +225,7 @@
       "str_max": 30,
       "sound": "rrrrip!",
       "sound_fail": "whump.",
-      "items": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 10, 15 ] }, { "item": "down_feather", "count": [ 45, 55 ] } ]
     }
   },
   {

data/json/furniture_and_terrain/furniture-storage.json

@@ -1052,6 +1052,100 @@
       "items": [ { "item": "2x4", "count": [ 3, 6 ] }, { "item": "splinter", "count": [ 2, 4 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_board_map",
+    "name": "map board",
+    "looks_like": "f_bulletin",
+    "description": "A secure metal board with a locked glass panel used to display a map.",
+    "symbol": "6",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 75,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM", "PICKABLE" ],
+    "deconstruct": {
+      "items": [
+        { "item": "pipe", "count": 4 },
+        { "item": "sheet_metal", "count": 1 },
+        { "item": "hinge", "count": 2 },
+        { "item": "glass_sheet", "count": 1 }
+      ]
+    },
+    "lockpick_result": "f_board_map_o",
+    "lockpick_message": "With a satisfying click, the locked glass panel opens",
+    "examine_action": "locked_object_pickable",
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "glass breaking",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 12,
+      "furn_set": "f_board_map_b",
+      "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_board_map_o",
+    "name": "open map board",
+    "looks_like": "f_bulletin",
+    "description": "A successfully picked metal board with an open glass panel used to display a map.",
+    "symbol": "6",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 75,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "pipe", "count": 4 },
+        { "item": "sheet_metal", "count": 1 },
+        { "item": "hinge", "count": 2 },
+        { "item": "glass_sheet", "count": 1 }
+      ]
+    },
+    "rotates_to": "INDOORFLOOR",
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "glass breaking",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 12,
+      "furn_set": "f_board_map_b",
+      "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_board_map_b",
+    "name": "broken map board",
+    "looks_like": "f_bulletin",
+    "description": "A metal board with a smashed glass panel used to display a map.",
+    "symbol": "6",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 75,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [ { "item": "pipe", "count": 4 }, { "item": "sheet_metal", "count": 1 }, { "item": "hinge", "count": [ 0, 1 ] } ]
+    },
+    "rotates_to": "INDOORFLOOR",
+    "bash": {
+      "str_min": 10,
+      "str_max": 20,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 2, 4 ] },
+        { "item": "hinge", "count": [ 0, 1 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_fireman_cabinet",

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -2122,7 +2122,7 @@
   {
     "type": "item_group",
     "id": "female_underwear_top",
-    "items": [ [ "corset", 5 ], [ "corset_waist", 5 ], { "group": "female_underwear_top_child", "prob": 190 } ]
+    "items": [ [ "corset", 5 ], [ "binder_top", 1 ], [ "corset_waist", 5 ], { "group": "female_underwear_top_child", "prob": 190 } ]
   },
   {
     "type": "item_group",
@@ -2155,7 +2155,14 @@
   {
     "type": "item_group",
     "id": "male_underwear_top",
-    "items": [ [ "undershirt", 50 ], [ "long_undertop", 20 ], [ "thermal_shirt", 10 ], [ "under_armor", 20 ], [ "tank_top", 50 ] ]
+    "items": [
+      [ "undershirt", 50 ],
+      [ "binder_top", 2 ],
+      [ "long_undertop", 20 ],
+      [ "thermal_shirt", 10 ],
+      [ "under_armor", 20 ],
+      [ "tank_top", 50 ]
+    ]
   },
   {
     "type": "item_group",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -163,6 +163,7 @@
     "items": [
       { "group": "magazines", "prob": 2000 },
       { "group": "kids_books", "prob": 35 },
+      { "group": "stand_flyer", "prob": 100 },
       [ "recipe_augs", 20 ],
       [ "decoy_anarch", 50 ],
       { "group": "newspaper_recent", "prob": 200 },
@@ -902,6 +903,7 @@
       [ "steel_pan", 10 ],
       [ "teapot", 25 ],
       [ "kettle", 25 ],
+      [ "fuel_tin", 25 ],
       [ "fishing_hook_basic", 35 ],
       [ "spike", 30 ],
       [ "wire_barbed", 25 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -1888,6 +1888,21 @@
     "type": "item_group",
     "items": [ [ "duffelbag", 5 ], [ "backpack", 5 ], [ "bag_plastic", 30 ], [ "basket_laundry", 30 ] ]
   },
+  {
+    "id": "plastic_dishes",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      {
+        "collection": [ { "item": "plastic_plate" }, { "item": "plastic_fork" }, { "item": "plastic_knife" }, { "item": "tumbler_plastic" } ],
+        "prob": 50
+      },
+      {
+        "collection": [ { "item": "bowl_plastic" }, { "item": "plastic_fork" }, { "item": "plastic_spoon" }, { "item": "tumbler_plastic" } ],
+        "prob": 50
+      }
+    ]
+  },
   {
     "id": "clothing_sport",
     "type": "item_group",

data/json/itemgroups/Locations_MapExtras/robofac_trade.json

@@ -2,15 +2,38 @@
   {
     "type": "item_group",
     "id": "NC_ROBOFAC_gear",
+    "//": "Should contain all Hub 01 gear",
     "subtype": "collection",
     "entries": [
       { "group": "robofac_armor_pieces" },
+      { "group": "robofac_armor_pieces_basic" },
       { "group": "robofac_armor_pieces_military" },
       { "group": "robofac_gun_mags" },
       { "group": "robofac_gun_exodii" },
       { "group": "robofac_gun_kit" },
+      { "item": "robofac_armor_anchor" },
+      { "item": "robofac_armor_anchor_on" },
+      { "item": "robofac_armor_rig" },
       { "item": "robofac_enviro_suit" },
-      { "item": "robofac_enviro_suit_casual" }
+      { "item": "robofac_enviro_suit_casual" },
+      { "item": "robofac_head_rig" },
+      { "item": "robofac_head_rig_ir" },
+      { "item": "robofac_head_rig_nv" },
+      { "item": "hm12" },
+      { "item": "template_armor" },
+      { "item": "template_photonics" }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "robofac_armor_pieces_basic",
+    "subtype": "collection",
+    "entries": [
+      { "item": "robofac_basic_helmet" },
+      { "item": "robofac_basic_greaves" },
+      { "item": "robofac_basic_mantle" },
+      { "item": "robofac_basic_skirt" },
+      { "item": "robofac_basic_vambraces" }
     ]
   },
   {