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

Maleclypse · Nov 13, 2021 · 7cfd46c · 7cfd46c
2 parents 6c8d987 + 610e7d5
commit 7cfd46c
Show file tree

Hide file tree

Showing 508 changed files with 175,298 additions and 74,596 deletions.
diff --git a/data/core/game_balance.json b/data/core/game_balance.json
@@ -208,12 +208,5 @@
     "info": "The scenario selected by default in the character creator menu.",
     "stype": "string_input",
     "value": "evacuee"
-  },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "WORKBENCH_ALL_OPTIONS",
-    "info": "If false, examining workbench-type furniture will auto-execute pickup and undeploy (where applicable) actions, no crafting-related options will be listed.",
-    "stype": "bool",
-    "value": true
   }
 ]
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -137,6 +137,31 @@
     "type": "ammo_effect",
     "explosion": { "power": 40, "shrapnel": { "casing_mass": 15, "fragment_mass": 0.08 } }
   },
+  {
+    "id": "EXPLOSIVE_GRENADE",
+    "type": "ammo_effect",
+    "explosion": { "power": 240, "shrapnel": { "casing_mass": 217, "fragment_mass": 0.08 } }
+  },
+  {
+    "id": "EXPLOSIVE_SMALL_HOMEMADE_GRENADE_1",
+    "type": "ammo_effect",
+    "explosion": { "power": 150, "shrapnel": { "casing_mass": 200, "fragment_mass": 0.4 } }
+  },
+  {
+    "id": "EXPLOSIVE_HOMEMADE_GRENADE_1",
+    "type": "ammo_effect",
+    "explosion": { "power": 300, "shrapnel": { "casing_mass": 400, "fragment_mass": 0.4 } }
+  },
+  {
+    "id": "EXPLOSIVE_SMALL_HOMEMADE_GRENADE_2",
+    "type": "ammo_effect",
+    "explosion": { "power": 460, "shrapnel": { "casing_mass": 200, "fragment_mass": 0.4 } }
+  },
+  {
+    "id": "EXPLOSIVE_HOMEMADE_GRENADE_2",
+    "type": "ammo_effect",
+    "explosion": { "power": 920, "shrapnel": { "casing_mass": 400, "fragment_mass": 0.4 } }
+  },
   {
     "id": "EXPLOSIVE_20x66",
     "type": "ammo_effect",

diff --git a/data/json/body_parts.json b/data/json/body_parts.json
@@ -26,7 +26,8 @@
     "base_hp": 60,
     "drench_capacity": 40,
     "smash_message": "You smash the %s with a powerful shoulder-check.",
-    "bionic_slots": 80
+    "bionic_slots": 80,
+    "sub_parts": [ "torso_upper", "torso_neck", "torso_lower", "torso_hanging_front", "torso_hanging_back" ]
   },
   {
     "id": "head",
@@ -150,7 +151,8 @@
     "base_hp": 60,
     "drench_capacity": 10,
     "smash_message": "You elbow-smash the %s.",
-    "bionic_slots": 20
+    "bionic_slots": 20,
+    "sub_parts": [ "arm_shoulder_l", "arm_upper_l", "arm_elbow_l", "arm_lower_l" ]
   },
   {
     "id": "arm_r",
@@ -185,7 +187,8 @@
     "base_hp": 60,
     "drench_capacity": 10,
     "smash_message": "You elbow-smash the %s.",
-    "bionic_slots": 20
+    "bionic_slots": 20,
+    "sub_parts": [ "arm_shoulder_r", "arm_upper_r", "arm_elbow_r", "arm_lower_r" ]
   },
   {
     "id": "hand_l",
@@ -282,7 +285,8 @@
     "base_hp": 60,
     "drench_capacity": 11,
     "smash_message": "You bring your knee down on the %s, smashing it.",
-    "bionic_slots": 30
+    "bionic_slots": 30,
+    "sub_parts": [ "leg_hip_l", "leg_upper_l", "leg_knee_l", "leg_lower_l" ]
   },
   {
     "id": "leg_r",
@@ -317,7 +321,8 @@
     "base_hp": 60,
     "drench_capacity": 11,
     "smash_message": "You bring your knee down on the %s, smashing it.",
-    "bionic_slots": 30
+    "bionic_slots": 30,
+    "sub_parts": [ "leg_hip_r", "leg_upper_r", "leg_knee_r", "leg_lower_r" ]
   },
   {
     "id": "foot_l",
@@ -407,5 +412,173 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "debug tail" },
     "hp_bar_ui_text": "DBG TAIL",
     "base_hp": 20
+  },
+  {
+    "id": "sub_limb_debug",
+    "type": "sub_body_part",
+    "opposite": "sub_limb_debug",
+    "name": "debug limb should never be seen"
+  },
+  {
+    "id": "torso_upper",
+    "type": "sub_body_part",
+    "opposite": "torso_lower",
+    "name_multiple": "torso",
+    "name": "upper torso"
+  },
+  {
+    "id": "torso_neck",
+    "type": "sub_body_part",
+    "opposite": "sub_limb_debug",
+    "name": "neck"
+  },
+  {
+    "id": "torso_lower",
+    "type": "sub_body_part",
+    "opposite": "torso_upper",
+    "name_multiple": "torso",
+    "name": "lower torso"
+  },
+  {
+    "id": "torso_hanging_front",
+    "type": "sub_body_part",
+    "name": "item hangs off your front",
+    "opposite": "torso_hanging_back",
+    "name_multiple": "item hangs off you"
+  },
+  {
+    "id": "torso_hanging_back",
+    "type": "sub_body_part",
+    "name": "item hangs off your back",
+    "opposite": "torso_hanging_front",
+    "name_multiple": "item hangs off you"
+  },
+  {
+    "id": "arm_shoulder_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "arm_shoulder_l",
+    "name_multiple": "shoulders",
+    "name": "right shoulder"
+  },
+  {
+    "id": "arm_upper_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "arm_upper_l",
+    "name_multiple": "upper arms",
+    "name": "right upper arm"
+  },
+  {
+    "id": "arm_elbow_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "arm_elbow_l",
+    "name_multiple": "elbows",
+    "name": "right elbow"
+  },
+  {
+    "id": "arm_lower_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "arm_lower_l",
+    "name_multiple": "lower arms",
+    "name": "right forearm"
+  },
+  {
+    "id": "arm_shoulder_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "arm_shoulder_r",
+    "name_multiple": "shoulders",
+    "name": "left shoulder"
+  },
+  {
+    "id": "arm_upper_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "arm_upper_r",
+    "name_multiple": "upper arms",
+    "name": "left upper arm"
+  },
+  {
+    "id": "arm_elbow_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "arm_elbow_r",
+    "name_multiple": "elbows",
+    "name": "left elbow"
+  },
+  {
+    "id": "arm_lower_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "arm_lower_r",
+    "name_multiple": "lower arms",
+    "name": "left forearm"
+  },
+  {
+    "id": "leg_hip_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "leg_hip_l",
+    "name_multiple": "hips",
+    "name": "right hip"
+  },
+  {
+    "id": "leg_upper_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "leg_upper_l",
+    "name_multiple": "thighs",
+    "name": "right thigh"
+  },
+  {
+    "id": "leg_knee_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "leg_knee_l",
+    "name_multiple": "knees",
+    "name": "right knee"
+  },
+  {
+    "id": "leg_lower_r",
+    "type": "sub_body_part",
+    "side": 2,
+    "opposite": "leg_lower_l",
+    "name_multiple": "lower legs",
+    "name": "right lower leg"
+  },
+  {
+    "id": "leg_hip_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "leg_hip_r",
+    "name_multiple": "hips",
+    "name": "left hip"
+  },
+  {
+    "id": "leg_upper_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "leg_upper_r",
+    "name_multiple": "thighs",
+    "name": "left thigh"
+  },
+  {
+    "id": "leg_knee_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "leg_knee_r",
+    "name_multiple": "knees",
+    "name": "left knee"
+  },
+  {
+    "id": "leg_lower_l",
+    "type": "sub_body_part",
+    "side": 1,
+    "opposite": "leg_lower_r",
+    "name_multiple": "lower legs",
+    "name": "left lower leg"
   }
 ]
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1318,7 +1318,7 @@
   {
     "type": "effect_type",
     "id": "hallu",
-    "max_duration": "30 m",
+    "max_duration": "6 h",
     "blood_analysis_description": "Hallucinations"
   },
   {

diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -217,6 +217,7 @@
     "id": "fd_sludge",
     "type": "field_type",
     "legacy_enum_id": 9,
+    "mopsafe": true,
     "intensity_levels": [
       {
         "name": "thin sludge trail",

diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
@@ -10,7 +10,7 @@
     "move_cost_mod": -1,
     "coverage": 35,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "AUTODOC", "CONTAINER", "NO_PICKUP_ON_EXAMINE" ],
+    "flags": [ "TRANSPARENT", "AUTODOC", "CONTAINER" ],
     "examine_action": "autodoc",
     "surgery_skill_multiplier": 1.0,
     "deconstruct": {