From 13e485c425b9e02df88d11f73910d2d0359bac8d Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 19 Aug 2024 23:42:52 -0500
Subject: [PATCH 01/23] Create xe_playable_gracken.json

More
---
 .../mutations/xe_playable_gracken.json        | 153 ++++++++++++++++++
 doc/MAGIC.md                                  |   2 +-
 2 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json

diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
new file mode 100644
index 0000000000000..06f9a21cadb8f
--- /dev/null
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -0,0 +1,153 @@
+[
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "hobby_species_gracken",
+    "name": "XE843 'Gracken' (Species)",
+    "description": "Species XE843 is how the Xedra scientists identified your people before they learned your people could speak to them after enough time around them to develop a way to communicate.  They had little idea that communication is your peoples survival trait, coming from a much harsher environment than the humans are…were blessed with, you can make allies with almost any thinking being.  You informed the Xedra people of your races name 'Gracken' but you didn't tell them that most of your people they found were larval forms and lacking access to the shadow materials needed would never grow up into an adult form.  Now the humans world is as deadly or moreso than your home and the way back is mostly closed.  Time to try and find a route home that wouldn't be a death sentence, or see what this world has to offer.",
+    "points": 4,
+    "proficiencies": [ "prof_traps" ],
+    "traits": [
+      "THRESH_SPECIES_GRACKEN",
+      "GRACKEN_BUILD",
+      "NIGHTVISION",
+      "SHADE_SKIN",
+      "SHADE_LEGS",
+      "SHADE_ARMS",
+      "SHADE_HANDS",
+      "SHADE_FEET",
+      "SHADE_STOMACH",
+      "RADIOTROPHIC",
+      "GRACKEN"
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "GRACKEN",
+    "//": "Gracken are creatures from the shadow dimension.  They create their own cbm like enhancements that each take up specific trait slots so each build can be unique.",
+    "name": { "str": "Gracken" },
+    "mixed_effect": true,
+    "valid": false,
+    "starting_trait": false,
+    "purifiable": false,
+    "profession": true,
+    "points": 2,
+    "scent_type": "sc_gracken",
+    "description": "A traveler from another dimension.  A dimension of shadows with few bright lights.  Once your species matures they gain the ability to create new alterations to their body from ingredients harvested from their kills, shadowstuff and magickal essence.",
+    "allowed_category": [ "GRACKEN" ],
+    "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
+  },
+  {
+    "type": "mutation",
+    "id": "THRESH_SPECIES_GRACKEN",
+    "name": { "str": "Gracken, Mature" },
+    "points": 1,
+    "description": "You have become a fully mature Gracken and have gained the ability to reform your body in ways previously blocked to you in your immature state.",
+    "valid": false,
+    "purifiable": false,
+    "threshold": true
+  },
+  {
+    "id": "mutagen_species_gracken",
+    "type": "vitamin",
+    "vit_type": "counter",
+    "//": "Nothing should give this currently, Gracken only use this to mature and only mature Gracken are playable currently.  If someone comes up with a decent plan on maturing larval Gracken into adults remove this note.",
+    "name": { "str": "Gracken Purifier" },
+    "excess": "mutagen_species_gracken",
+    "min": 0,
+    "max": 2500,
+    "rate": "1 h",
+    "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
+  },
+  {
+    "type": "mutation",
+    "id": "NIGHTVISION",
+    "copy-from": "NIGHTVISION",
+    "extend": { "category": [ "GRACKEN" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "GRACKEN_BUILD",
+    "name": { "str": "Gracken Build" },
+    "types": [ "SIZE" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "description": "Gracken are about the same size as humans, though they look like shadow demons.",
+    "//": "This is the baseline Gracken size mutation.",
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_LEGS",
+    "name": { "str": "Shade Legs" },
+    "description": "Your legs are human sized but appear to be made of swirling shadows.",
+    "//": "This is the baseline Gracken leg mutation.",
+    "types": [ "LEGS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_FEET",
+    "name": { "str": "Shade Legs" },
+    "description": "Your feet are humanoid but appear to be made of swirling shadows.",
+    "//": "This is the baseline Gracken leg mutation.",
+    "types": [ "FEET" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ],
+    "flags": [ "TOUGH_FEET" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_HANDS",
+    "name": { "str": "Shade Hands" },
+    "description": "Your hands are humanoid but appear to be made of swirling shadows.",
+    "//": "This is the baseline Gracken leg mutation.",
+    "types": [ "HANDS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_STOMACH",
+    "name": { "str": "Shade Stomach" },
+    "description": "Your dietary needs are so minimized that you could travel months or years without eating.  There are consequences to this.",
+    "//": "This is the baseline Gracken leg mutation.",
+    "types": [ "HANDS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "enchantments": [ { "values": [ { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -1 }, { "value": "METABOLISM", "multiply": -0.5 } ] } ],
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "RADIOTROPHIC",
+    "name": { "str": "Radiotrophic" },
+    "points": 3,
+    "vitamin_cost": 160,
+    "description": "Your system has adapted to radiation.  While irradiated, you will convert the radiation into calories.",
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  }
+]
\ No newline at end of file
diff --git a/doc/MAGIC.md b/doc/MAGIC.md
index e7486a851b94c..327dc56c60ef5 100644
--- a/doc/MAGIC.md
+++ b/doc/MAGIC.md
@@ -853,7 +853,7 @@ Character status value  | Description
 `MELEE_DAMAGE`          | Adds damage to melee attacks
 `MELEE_STAMINA_CONSUMPTION` | Changes amount of stamina used when swing in melee; stamina consumption is a negative value, so `"add": 100` decreases amount of stamina consumed, when `"add": -100` increases it; `"multiply": 1` increases, `"multiply": -0.5` decreases it. Can't be bigger than -50.
 `MENDING_MODIFIER`      | Changes the speed of your limb mend. Since it's a percent, using `multiply` is recommended.
-`METABOLISM`            | Multiplier for `metabolic_rate_base`, which respond for default bmi rate; Formula for basic bmi is `metabolic_rate_base * ( (weight_in_kg / 10 ) + (6.25 * height) - (5 * age) + 5 )`; Since it's a percent, using `multiply` is recommended; Since metabolism is directly connected to weariness, at this moment decreasing it makes you more weary the less metabolism you have; zero metabolism (`multiply: -1`) is handled separately, and makes you never wear
+`METABOLISM`            | Multiplier for `metabolic_rate_base`, which respond for default bmi rate; Formula for basic bmi is `metabolic_rate_base * ( (weight_in_kg / 10 ) + (6.25 * height) - (5 * age) + 5 )`; Since it's a percent, using `multiply` is recommended; Since metabolism is directly connected to weariness, at this moment decreasing it makes you more weary the less metabolism you have; zero metabolism (`multiply: -1`) is handled separately, and makes you never weary.
 `MOD_HEALTH`            | If this is anything other than zero (which it defaults to) you will to mod your health to a max/min of `MOD_HEALTH_CAP` every half hour.
 `MOD_HEALTH_CAP`        | If this is anything other than zero (which it defaults to) you will cap your `MOD_HEALTH` gain/loss at this every half hour.
 `MOTION_VISION_RANGE`   | Reveals all monsters as a red `?` within the specified radius.

From dca6ff6ba86607911700b09fcabfbe27b6378051 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Wed, 21 Aug 2024 21:07:04 -0500
Subject: [PATCH 02/23] First Draft

Fix
---
 .../mutations/gracken_trait_eocs.json          | 18 ++++++++++++++++++
 .../mutations/xe_playable_gracken.json         | 13 +++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json

diff --git a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
new file mode 100644
index 0000000000000..59261f910a5cb
--- /dev/null
+++ b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "EOC_GRACKEN_CONVERT_RADS_TO_CALORIES",
+    "recurrence": [ "5 seconds", "15 seconds" ],
+    "condition": { "u_has_trait": "RADIOTROPHIC" },
+"deactivate_condition": { "not": { "u_has_trait": "RADIOTROPHIC" } },
+    "effect": [
+      {
+        "if": { "math": [ "u_val('rad')", ">=", "100" ] },
+        "then": [ { "math": [ "u_calories()", "+=", "3" ] }, { "math": [ "u_val('rad')", "-=", "1" ] } ]
+      },
+      {
+        "if": { "and": [ { "math": [ "u_val('rad')", "<", "100" ] }, { "math": [ "u_val('rad')", ">", "0" ] } ] },
+        "then": [ { "math": [ "u_calories()", "+=", "2" ] }, { "math": [ "u_val('rad')", "-=", "1" ] } ]
+      }
+    ]
+  }
+]
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 06f9a21cadb8f..923693b64e09c 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -130,24 +130,25 @@
     "type": "mutation",
     "id": "SHADE_STOMACH",
     "name": { "str": "Shade Stomach" },
-    "description": "Your dietary needs are so minimized that you could travel months or years without eating.  There are consequences to this.",
-    "//": "This is the baseline Gracken leg mutation.",
-    "types": [ "HANDS" ],
+    "description": "Your dietary needs are so minimized that you could travel months or years without eating.  There are consequences to this.  One is an inability to process normal food.  Another is a pretty constant state of weariness, but this is the best way to handle interdimensional travel until you are able to develop an organ to consume local foods.",
+    "//": "This is the baseline Gracken stomach mutation.",
+    "types": [ "STOMACH" ],
     "purifiable": false,
     "mixed_effect": true,
     "points": 1,
-    "enchantments": [ { "values": [ { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -1 }, { "value": "METABOLISM", "multiply": -0.5 } ] } ],
+    "enchantments": [ { "values": [ { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -1 }, { "value": "METABOLISM", "multiply": -0.8 } ] } ],
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   },
-  {
+   {
     "type": "mutation",
     "id": "RADIOTROPHIC",
     "name": { "str": "Radiotrophic" },
+    "types": [ "DIET" ],
     "points": 3,
     "vitamin_cost": 160,
     "description": "Your system has adapted to radiation.  While irradiated, you will convert the radiation into calories.",
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   }
-]
\ No newline at end of file
+]

From f79b5ba2c50143b19a51149a6d6717e13ff75987 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:07:46 -0500
Subject: [PATCH 03/23] lint

---
 data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json  | 2 +-
 data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
index 59261f910a5cb..d88ddfaf312ef 100644
--- a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
+++ b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
@@ -3,7 +3,7 @@
     "id": "EOC_GRACKEN_CONVERT_RADS_TO_CALORIES",
     "recurrence": [ "5 seconds", "15 seconds" ],
     "condition": { "u_has_trait": "RADIOTROPHIC" },
-"deactivate_condition": { "not": { "u_has_trait": "RADIOTROPHIC" } },
+    "deactivate_condition": { "not": { "u_has_trait": "RADIOTROPHIC" } },
     "effect": [
       {
         "if": { "math": [ "u_val('rad')", ">=", "100" ] },
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 923693b64e09c..6f84073d508bb 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -136,11 +136,13 @@
     "purifiable": false,
     "mixed_effect": true,
     "points": 1,
-    "enchantments": [ { "values": [ { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -1 }, { "value": "METABOLISM", "multiply": -0.8 } ] } ],
+    "enchantments": [
+      { "values": [ { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -1 }, { "value": "METABOLISM", "multiply": -0.8 } ] }
+    ],
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   },
-   {
+  {
     "type": "mutation",
     "id": "RADIOTROPHIC",
     "name": { "str": "Radiotrophic" },

From ea2db12076979a8cefb1324dc2ae7c0cb39f4a6d Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sat, 24 Aug 2024 22:36:58 -0500
Subject: [PATCH 04/23] Integrated Pocket

---
 .../Xedra_Evolved/items/armor/integrated.json | 25 ++++++++++
 .../mutations/xe_playable_gracken.json        | 49 +++++++++++++++++--
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
index 62cf695c22e6b..86bec7de8e17b 100644
--- a/data/mods/Xedra_Evolved/items/armor/integrated.json
+++ b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -527,6 +527,31 @@
     ],
     "flags": [ "INTEGRATED", "PADDED", "SEMITANGIBLE", "ZERO_WEIGHT", "TARDIS", "UNBREAKABLE", "PERSONAL", "SOFT", "WATER_FRIENDLY" ]
   },
+  {
+    "id": "item_gracken_shadowstuff_pocket",
+    "type": "GENERIC",
+    "category": "clothing",
+    "name": { "str": "shadowstuff organ" },
+    "description": "You have an organ inside of your body that makes a material you can create improved versions of your body parts with.  You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.",
+    "to_hit": -1,
+    "material": [ "demihuman_flesh" ],
+    "symbol": ")",
+    "color": "light_gray",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "max_contains_volume": "3 L",
+        "max_item_volume": "80 ml",
+        "max_contains_weight": "6 kg",
+        "volume_encumber_modifier": 0,
+        "volume_multiplier": 0,
+        "weight_multiplier": 0,
+        "item_restriction": [ "scrap_shadowstuff" ]
+      }
+    ],
+    "flags": [ "INTEGRATED", "NO_UNLOAD", "PADDED", "SEMITANGIBLE", "ZERO_WEIGHT", "TARDIS", "UNBREAKABLE", "PERSONAL", "SOFT", "WATER_FRIENDLY" ]
+  },
   {
     "id": "integrated_cloud_skin",
     "type": "ARMOR",
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 6f84073d508bb..6632a6ae79799 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -98,7 +98,7 @@
   {
     "type": "mutation",
     "id": "SHADE_FEET",
-    "name": { "str": "Shade Legs" },
+    "name": { "str": "Shade Feet" },
     "description": "Your feet are humanoid but appear to be made of swirling shadows.",
     "//": "This is the baseline Gracken leg mutation.",
     "types": [ "FEET" ],
@@ -116,7 +116,7 @@
     "id": "SHADE_HANDS",
     "name": { "str": "Shade Hands" },
     "description": "Your hands are humanoid but appear to be made of swirling shadows.",
-    "//": "This is the baseline Gracken leg mutation.",
+    "//": "This is the baseline Gracken hands mutation.",
     "types": [ "HANDS" ],
     "purifiable": false,
     "mixed_effect": true,
@@ -126,11 +126,43 @@
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   },
+  {
+    "type": "mutation",
+    "id": "SHADE_CLAWED_HANDS",
+    "name": { "str": "Shade Clawed Hands" },
+    "description": "Your hands are humanoid but appear to be made of swirling shadows.  At the end of each finger you sport a razor sharp nail.  It increases your damage when unarmed.",
+    "//": "This is the first stage unarmed melee hands mutation.",
+    "types": [ "HANDS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "values": [ { "value": "ITEM_DAMAGE_CUT", "add": 2 } ] } ],
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_DEXTROUS_HANDS",
+    "name": { "str": "Shade Dextrous Hands" },
+    "description": "Your hands are humanoid but appear to be made of swirling shadows.  You sport an extra digit on every finger that improves your ability to get into tight situations..",
+    "//": "This is the first stage crafting hands mutation.",
+    "types": [ "HANDS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "enchantments": [ { "values": [ { "value": "CRAFTING_SPEED_MULTIPLIER", "multiply": 0.1 } ] } ],
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
   {
     "type": "mutation",
     "id": "SHADE_STOMACH",
     "name": { "str": "Shade Stomach" },
-    "description": "Your dietary needs are so minimized that you could travel months or years without eating.  There are consequences to this.  One is an inability to process normal food.  Another is a pretty constant state of weariness, but this is the best way to handle interdimensional travel until you are able to develop an organ to consume local foods.",
+    "description": "Your dietary needs are so minimized that you could travel months or years without eating.  There are consequences to this.  One is an inability to process normal food.  Another is a pretty constant state of weariness, but this is the best way to handle interdimensional travel until you are able to develop an organ to consume local foods.  The ambient energies here are much weaker than what you normally encounter out in the Nether between universes, you need exposure to nuclear radiation to gain calories on this planet, for now.",
     "//": "This is the baseline Gracken stomach mutation.",
     "types": [ "STOMACH" ],
     "purifiable": false,
@@ -142,6 +174,17 @@
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   },
+  {
+    "type": "mutation",
+    "id": "SHADE_EVOLUTION_GLAND",
+    "name": { "str": "Evolution Gland " },
+    "points": 8,
+    "purifiable": false,
+    "description": "The events of the Cataclysm have damaged your DNA beyond repair.  You mutate frequently, all mutations you receive (from any source) are negative, and your instability is rapidly growing out of control.",
+    "cancels": [ "ROBUST", "RESTRICTED" ],
+    "valid": false,
+    "integrated_armor": [ "item_gracken_shadowstuff_pocket" ]
+  },
   {
     "type": "mutation",
     "id": "RADIOTROPHIC",

From 32b47781bb815825b3999b59768b07b4e0d1908e Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 00:45:43 -0500
Subject: [PATCH 05/23] Arms and hands

---
 .../Xedra_Evolved/items/armor/integrated.json | 17 +-----
 .../mutations/gracken_spells.json             | 16 +++++
 .../mutations/gracken_trait_eocs.json         | 14 +++++
 .../mutations/xe_playable_gracken.json        | 60 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 17 deletions(-)
 create mode 100644 data/mods/Xedra_Evolved/mutations/gracken_spells.json

diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
index 86bec7de8e17b..185401b4a1c72 100644
--- a/data/mods/Xedra_Evolved/items/armor/integrated.json
+++ b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -532,24 +532,13 @@
     "type": "GENERIC",
     "category": "clothing",
     "name": { "str": "shadowstuff organ" },
-    "description": "You have an organ inside of your body that makes a material you can create improved versions of your body parts with.  You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.",
+    "description": "You have an organ inside of your body that grows a material you can create improved versions of your body parts with.  You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.",
     "to_hit": -1,
     "material": [ "demihuman_flesh" ],
     "symbol": ")",
     "color": "light_gray",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "max_contains_volume": "3 L",
-        "max_item_volume": "80 ml",
-        "max_contains_weight": "6 kg",
-        "volume_encumber_modifier": 0,
-        "volume_multiplier": 0,
-        "weight_multiplier": 0,
-        "item_restriction": [ "scrap_shadowstuff" ]
-      }
-    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "scrap_shadowstuff": 3 }, "airtight": true } ],
+    "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "168 h", "regenerate_ammo": true } },
     "flags": [ "INTEGRATED", "NO_UNLOAD", "PADDED", "SEMITANGIBLE", "ZERO_WEIGHT", "TARDIS", "UNBREAKABLE", "PERSONAL", "SOFT", "WATER_FRIENDLY" ]
   },
   {
diff --git a/data/mods/Xedra_Evolved/mutations/gracken_spells.json b/data/mods/Xedra_Evolved/mutations/gracken_spells.json
new file mode 100644
index 0000000000000..6caade62217cd
--- /dev/null
+++ b/data/mods/Xedra_Evolved/mutations/gracken_spells.json
@@ -0,0 +1,16 @@
+[
+  {
+    "id": "gracken_arm_push_spell",
+    "type": "SPELL",
+    "name": "Gracken Long Arms Spell",
+    "description": "Push a target to you.",
+    "message": "",
+    "valid_targets": [ "hostile" ],
+    "flags": [ "SILENT" ],
+    "effect": "directed_push",
+    "shape": "blast",
+    "difficulty": 1,
+    "min_damage": { "math": [ "(u_val('dexterity') / 2)" ] },
+    "min_range": { "math": [ "(u_val('dexterity') / 4)" ] }
+  }
+]
diff --git a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
index d88ddfaf312ef..1ae69fef848f6 100644
--- a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
+++ b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
@@ -14,5 +14,19 @@
         "then": [ { "math": [ "u_calories()", "+=", "2" ] }, { "math": [ "u_val('rad')", "-=", "1" ] } ]
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_GRACKEN_ARM_PUSH1_activated",
+    "effect": [
+      {
+        "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION",
+        "variables": {
+          "prep_time": "1",
+          "spell_to_cast": "gracken_arm_push_spell",
+          "message_success": { "i18n": true, "str": "You lash out and push your target away!" }
+        }
+      }
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 6632a6ae79799..1ae1a0d9eafaf 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -17,6 +17,7 @@
       "SHADE_HANDS",
       "SHADE_FEET",
       "SHADE_STOMACH",
+      "SHADE_EVOLUTION_GLAND",
       "RADIOTROPHIC",
       "GRACKEN"
     ]
@@ -111,6 +112,57 @@
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ],
     "flags": [ "TOUGH_FEET" ]
   },
+  {
+    "type": "mutation",
+    "id": "SHADE_ARMS",
+    "name": { "str": "Shade Arms" },
+    "description": "Your arms are humanoid but appear to be made of swirling shadows.",
+    "//": "This is the baseline Gracken arms mutation.",
+    "types": [ "ARMS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_STRONG_ARMS",
+    "name": { "str": "Strong Arms" },
+    "description": "Your arms have begun bulking up and become stronger. +1 Strength",
+    "//": "This is the first stage strong arms mutation.",
+    "types": [ "ARMS" ],
+    "prereqs": [ "SHADE_ARMS" ],
+    "enchantments": [ { "values": [ { "value": "STRENGTH", "add": 1 } ] } ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
+  {
+    "type": "mutation",
+    "id": "SHADE_LONG_ARMS",
+    "name": { "str": "Long Arms" },
+    "description": "Your arms have lengthened. You can push a target away from you.",
+    "//": "This is the first stage long arms mutation.",
+    "types": [ "ARMS" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 4,
+    "ugliness": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ],
+    "prereqs": [ "SHADE_ARMS" ],
+    "activated_is_setup": false,
+    "active": true,
+    "activated_eocs": [ "EOC_GRACKEN_ARM_PUSH1_activated" ]
+  },
   {
     "type": "mutation",
     "id": "SHADE_HANDS",
@@ -128,11 +180,12 @@
   },
   {
     "type": "mutation",
-    "id": "SHADE_CLAWED_HANDS",
-    "name": { "str": "Shade Clawed Hands" },
+    "id": "SHADE_SHARP_NAILS",
+    "name": { "str": "Shade Sharp Nails" },
     "description": "Your hands are humanoid but appear to be made of swirling shadows.  At the end of each finger you sport a razor sharp nail.  It increases your damage when unarmed.",
     "//": "This is the first stage unarmed melee hands mutation.",
     "types": [ "HANDS" ],
+    "prereqs": [ "SHADE_HANDS" ],
     "purifiable": false,
     "mixed_effect": true,
     "points": 1,
@@ -149,6 +202,7 @@
     "description": "Your hands are humanoid but appear to be made of swirling shadows.  You sport an extra digit on every finger that improves your ability to get into tight situations..",
     "//": "This is the first stage crafting hands mutation.",
     "types": [ "HANDS" ],
+    "prereqs": [ "SHADE_HANDS" ],
     "purifiable": false,
     "mixed_effect": true,
     "points": 1,
@@ -180,7 +234,7 @@
     "name": { "str": "Evolution Gland " },
     "points": 8,
     "purifiable": false,
-    "description": "The events of the Cataclysm have damaged your DNA beyond repair.  You mutate frequently, all mutations you receive (from any source) are negative, and your instability is rapidly growing out of control.",
+    "description": "You have a gland that grows a small amount of the material needed to make biological improvements to yourself.  You must gather dreamdross and components from monsters you wish to gain the abilities of and combine them with this shadowstuff into new organs and abilities.",
     "cancels": [ "ROBUST", "RESTRICTED" ],
     "valid": false,
     "integrated_armor": [ "item_gracken_shadowstuff_pocket" ]

From 903af2394443c050e89353fd2bb0f1ee29f4e1e9 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 01:02:22 -0500
Subject: [PATCH 06/23] Create gracken_improvements.json

---
 .../recipes/gracken_improvements.json         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 data/mods/Xedra_Evolved/recipes/gracken_improvements.json

diff --git a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
new file mode 100644
index 0000000000000..98628440781a8
--- /dev/null
+++ b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
@@ -0,0 +1,41 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_shade_arms",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 2 ], [ "sinew", 5 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_strong_arms",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "tough_zombie_muscle", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_long_arms",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "grapler_zombie_muscle", 1 ] ] ]
+  }
+]
\ No newline at end of file

From 46798aa473ee631bfab812d1ddbbf4fc8940a90c Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 01:41:57 -0500
Subject: [PATCH 07/23] More stuff

---
 .../harvest_monster_hunter_gracken.json       | 10 +++
 data/mods/Xedra_Evolved/items/ammo.json       | 18 +++++
 .../items/gracken_trait_improvements.json     | 78 +++++++++++++++++++
 .../recipes/gracken_improvements.json         |  4 +-
 4 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
 create mode 100644 data/mods/Xedra_Evolved/items/gracken_trait_improvements.json

diff --git a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
new file mode 100644
index 0000000000000..cdd4da9b35979
--- /dev/null
+++ b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "zombie_grabber",
+    "type": "item_group",
+    "subtype": "distribution",
+    "copy-from": "zombie_grabber",
+    "extend": { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] },
+    "delete": { "entries": [ { "item": "sinew", "mass_ratio": 0.00035 } ] }
+  }
+]
diff --git a/data/mods/Xedra_Evolved/items/ammo.json b/data/mods/Xedra_Evolved/items/ammo.json
index c88fe29c97ae0..ceb87be1dfe04 100644
--- a/data/mods/Xedra_Evolved/items/ammo.json
+++ b/data/mods/Xedra_Evolved/items/ammo.json
@@ -101,6 +101,24 @@
     "effects": [ "IGNITE" ],
     "flags": [ "ZERO_WEIGHT" ]
   },
+  {
+    "type": "AMMO",
+    "id": "grappler_sinew",
+    "category": "spare_parts",
+    "price": "0 cent",
+    "price_postapoc": "25 cent",
+    "name": { "str": "elastic sinew" },
+    "symbol": "=",
+    "color": "light_red",
+    "looks_like": "thread",
+    "description": "An elastic sinew cut from a corpse, usable as thread.",
+    "material": [ "flesh" ],
+    "volume": "250 ml",
+    "weight": "1 g",
+    "ammo_type": "thread",
+    "count": 10,
+    "stack_size": 200
+  },
   {
     "id": "glamour_charge",
     "type": "AMMO",
diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
new file mode 100644
index 0000000000000..cbf8335d8b43c
--- /dev/null
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -0,0 +1,78 @@
+[
+  {
+    "abstract": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "category": "MED",
+    "name": { "str": "abstract gracken improvement" },
+    "weight": "2041 g",
+    "volume": "2500 ml",
+    "material": [ "demihuman_flesh", "shadowstuff" ],
+    "symbol": "!",
+    "color": "light_gray",
+    "price_postapoc": "10 USD",
+    "flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ]
+  },
+  {
+    "id": "gracken_shade_arms",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Shade Arms" },
+    "looks_like": "fetus",
+    "description": "An organ that allows a mature Gracken to convert their arms back to a base state.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back to a base model.",
+      "effect_on_conditions": [
+        {
+          "id": "shade_arms",
+          "effect": [
+            { "u_message": "You exchanged your previous arms for these." },
+            { "u_add_trait": "SHADE_ARMS" }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_strong_arms",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Strong Arms" },
+    "looks_like": "fetus",
+    "description": "An organ that allows a mature Gracken to convert their arms to a stronger form.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back for a stronger form factor.",
+      "effect_on_conditions": [
+        {
+          "id": "strong_arms",
+          "effect": [
+            { "u_message": "You exchanged your previous arms for these." },
+            { "u_add_trait": "SHADE_STRONG_ARMS" }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_strong_arms",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Long Arms" },
+    "looks_like": "fetus",
+    "description": "An organ that allows a mature Gracken to convert their arms to a longer form.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back for a longer form factor.",
+      "effect_on_conditions": [
+        {
+          "id": "long_arms",
+          "effect": [
+            { "u_message": "You exchanged your previous arms for these." },
+            { "u_add_trait": "SHADE_LONG_ARMS" }
+          ]
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
index 98628440781a8..ebfddeb00cbb8 100644
--- a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
+++ b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
@@ -23,7 +23,7 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
-    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "tough_zombie_muscle", 1 ] ] ]
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "sinew", 40 ] ] ]
   },
   {
     "type": "recipe",
@@ -36,6 +36,6 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
-    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "grapler_zombie_muscle", 1 ] ] ]
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "grappler_sinew", 1 ] ] ]
   }
 ]
\ No newline at end of file

From 0450c1a422de8725214d538dab5a2a35e8d60417 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 11:43:49 -0500
Subject: [PATCH 08/23] Lint

---
 .../Xedra_Evolved/items/armor/integrated.json   | 13 ++++++++++++-
 .../items/gracken_trait_improvements.json       | 17 ++++-------------
 .../recipes/gracken_improvements.json           |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
index 185401b4a1c72..085acaa5ccc03 100644
--- a/data/mods/Xedra_Evolved/items/armor/integrated.json
+++ b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -539,7 +539,18 @@
     "color": "light_gray",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "scrap_shadowstuff": 3 }, "airtight": true } ],
     "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "168 h", "regenerate_ammo": true } },
-    "flags": [ "INTEGRATED", "NO_UNLOAD", "PADDED", "SEMITANGIBLE", "ZERO_WEIGHT", "TARDIS", "UNBREAKABLE", "PERSONAL", "SOFT", "WATER_FRIENDLY" ]
+    "flags": [
+      "INTEGRATED",
+      "NO_UNLOAD",
+      "PADDED",
+      "SEMITANGIBLE",
+      "ZERO_WEIGHT",
+      "TARDIS",
+      "UNBREAKABLE",
+      "PERSONAL",
+      "SOFT",
+      "WATER_FRIENDLY"
+    ]
   },
   {
     "id": "integrated_cloud_skin",
diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index cbf8335d8b43c..cfda0df32ac45 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -25,10 +25,7 @@
       "effect_on_conditions": [
         {
           "id": "shade_arms",
-          "effect": [
-            { "u_message": "You exchanged your previous arms for these." },
-            { "u_add_trait": "SHADE_ARMS" }
-          ]
+          "effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_ARMS" } ]
         }
       ]
     }
@@ -46,10 +43,7 @@
       "effect_on_conditions": [
         {
           "id": "strong_arms",
-          "effect": [
-            { "u_message": "You exchanged your previous arms for these." },
-            { "u_add_trait": "SHADE_STRONG_ARMS" }
-          ]
+          "effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_STRONG_ARMS" } ]
         }
       ]
     }
@@ -67,12 +61,9 @@
       "effect_on_conditions": [
         {
           "id": "long_arms",
-          "effect": [
-            { "u_message": "You exchanged your previous arms for these." },
-            { "u_add_trait": "SHADE_LONG_ARMS" }
-          ]
+          "effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_LONG_ARMS" } ]
         }
       ]
     }
   }
-]
\ No newline at end of file
+]
diff --git a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
index ebfddeb00cbb8..0cce6ccbc0a7e 100644
--- a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
+++ b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
@@ -38,4 +38,4 @@
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
     "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "grappler_sinew", 1 ] ] ]
   }
-]
\ No newline at end of file
+]

From 58d42b996371a8c3e9254b0d34084e9d1fa58f2c Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:12:45 -0500
Subject: [PATCH 09/23] Update gracken_improvements.json

---
 .../recipes/gracken_improvements.json         | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
index 0cce6ccbc0a7e..6b61e6a9cef5c 100644
--- a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
+++ b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
@@ -10,7 +10,7 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
-    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 2 ], [ "sinew", 5 ] ] ]
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 2 ] ], [ [ "sinew", 5 ] ] ]
   },
   {
     "type": "recipe",
@@ -23,7 +23,7 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
-    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "sinew", 40 ] ] ]
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ] ], [ [ "sinew", 40 ] ] ]
   },
   {
     "type": "recipe",
@@ -36,6 +36,45 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ] ], [ [ "grappler_sinew", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_shade_hands",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 2 ] ], [ [ "mutant_meat", 2 ], [ "meat_tainted", 2 ], [ "meat", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_sharp_nails",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ] ], [ [ "bone", 2 ], [ "bone_tainted", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "gracken_dextrous_hands",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_GRACKEN",
+    "skill_used": "deduction",
+    "difficulty": 1,
+    "time": "30 m",
+    "flags": [ "SECRET" ],
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
     "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 1 ], [ "grappler_sinew", 1 ] ] ]
   }
 ]

From ec86ba6c1fdbecc247308560304a3297a1cc2c2c Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:38:00 -0500
Subject: [PATCH 10/23] Update
 data/mods/Xedra_Evolved/recipes/gracken_improvements.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/mods/Xedra_Evolved/recipes/gracken_improvements.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
index 6b61e6a9cef5c..8869e09943cae 100644
--- a/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
+++ b/data/mods/Xedra_Evolved/recipes/gracken_improvements.json
@@ -49,7 +49,11 @@
     "time": "30 m",
     "flags": [ "SECRET" ],
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "COOK", "level": 1 } ],
-    "components": [ [ [ "scrap_dreamdross", 1 ] ], [ [ "scrap_shadowstuff", 2 ] ], [ [ "mutant_meat", 2 ], [ "meat_tainted", 2 ], [ "meat", 2 ] ] ]
+    "components": [
+      [ [ "scrap_dreamdross", 1 ] ],
+      [ [ "scrap_shadowstuff", 2 ] ],
+      [ [ "mutant_meat", 2 ], [ "meat_tainted", 2 ], [ "meat", 2 ] ]
+    ]
   },
   {
     "type": "recipe",

From 6027ee46165e6a0d22305b4cbdcf6882befdb357 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:21:29 -0500
Subject: [PATCH 11/23] Fixes

---
 .../harvest_monster_hunter_gracken.json       | 18 ++++--
 .../items/gracken_trait_improvements.json     | 62 +++++++++++++++++--
 .../mutations/xe_playable_gracken.json        |  1 +
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
index cdd4da9b35979..71a4d6021192c 100644
--- a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
+++ b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
@@ -1,10 +1,18 @@
 [
   {
     "id": "zombie_grabber",
-    "type": "item_group",
-    "subtype": "distribution",
-    "copy-from": "zombie_grabber",
-    "extend": { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] },
-    "delete": { "entries": [ { "item": "sinew", "mass_ratio": 0.00035 } ] }
+    "//": "zombie with long gangly arms",
+    "type": "harvest",
+    "message": "<zombie_grabber_harvest>",
+    "entries": [
+      { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
+      { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
+      { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] },
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index cfda0df32ac45..75b969bd5a9ef 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -10,14 +10,14 @@
     "symbol": "!",
     "color": "light_gray",
     "price_postapoc": "10 USD",
-    "flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ]
+    "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ]
   },
   {
     "id": "gracken_shade_arms",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
     "name": { "str": "Gracken Shade Arms" },
-    "looks_like": "fetus",
+    "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms back to a base state.",
     "use_action": {
       "type": "effect_on_conditions",
@@ -35,7 +35,7 @@
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
     "name": { "str": "Gracken Strong Arms" },
-    "looks_like": "fetus",
+    "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a stronger form.",
     "use_action": {
       "type": "effect_on_conditions",
@@ -53,7 +53,7 @@
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
     "name": { "str": "Gracken Long Arms" },
-    "looks_like": "fetus",
+    "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a longer form.",
     "use_action": {
       "type": "effect_on_conditions",
@@ -65,5 +65,59 @@
         }
       ]
     }
+  },
+  {
+    "id": "gracken_shade_hands",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Shade Hands" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their hands back to a base state.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back to a base model.",
+      "effect_on_conditions": [
+        {
+          "id": "shade_hands",
+          "effect": [ { "u_message": "You exchanged your previous arms for these." }, { "u_add_trait": "SHADE_ARMS" } ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_sharp_nails",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Sharp Nails" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their hands to a sharper form.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back for a sharper form factor.",
+      "effect_on_conditions": [
+        {
+          "id": "sharp_nails",
+          "effect": [ { "u_message": "You exchanged your previous hands for these." }, { "u_add_trait": "SHADE_SHARP_NAILS" } ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_dextrous_hands",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str": "Gracken Dextrous Hands" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their hands to a more agile form.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Exchanged the limb back for a longer form factor.",
+      "effect_on_conditions": [
+        {
+          "id": "long_arms",
+          "effect": [ { "u_message": "You exchanged your previous hands for these." }, { "u_add_trait": "SHADE_DEXTROUS_HANDS" } ]
+        }
+      ]
+    }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 1ae1a0d9eafaf..ba200829f8bf5 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -7,6 +7,7 @@
     "description": "Species XE843 is how the Xedra scientists identified your people before they learned your people could speak to them after enough time around them to develop a way to communicate.  They had little idea that communication is your peoples survival trait, coming from a much harsher environment than the humans are…were blessed with, you can make allies with almost any thinking being.  You informed the Xedra people of your races name 'Gracken' but you didn't tell them that most of your people they found were larval forms and lacking access to the shadow materials needed would never grow up into an adult form.  Now the humans world is as deadly or moreso than your home and the way back is mostly closed.  Time to try and find a route home that wouldn't be a death sentence, or see what this world has to offer.",
     "points": 4,
     "proficiencies": [ "prof_traps" ],
+    "recipes": [ "gracken_strong_arms", "gracken_long_arms", "gracken_shade_arms", "gracken_shade_hands",  "gracken_sharp_nails", "gracken_dextrous_hands" ],
     "traits": [
       "THRESH_SPECIES_GRACKEN",
       "GRACKEN_BUILD",

From 67062e368e643bc91be27beaeff924eba160b296 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:42:36 -0500
Subject: [PATCH 12/23] Update
 data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../Xedra_Evolved/mutations/xe_playable_gracken.json     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index ba200829f8bf5..8fc4f4ce62c61 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -7,7 +7,14 @@
     "description": "Species XE843 is how the Xedra scientists identified your people before they learned your people could speak to them after enough time around them to develop a way to communicate.  They had little idea that communication is your peoples survival trait, coming from a much harsher environment than the humans are…were blessed with, you can make allies with almost any thinking being.  You informed the Xedra people of your races name 'Gracken' but you didn't tell them that most of your people they found were larval forms and lacking access to the shadow materials needed would never grow up into an adult form.  Now the humans world is as deadly or moreso than your home and the way back is mostly closed.  Time to try and find a route home that wouldn't be a death sentence, or see what this world has to offer.",
     "points": 4,
     "proficiencies": [ "prof_traps" ],
-    "recipes": [ "gracken_strong_arms", "gracken_long_arms", "gracken_shade_arms", "gracken_shade_hands",  "gracken_sharp_nails", "gracken_dextrous_hands" ],
+    "recipes": [
+      "gracken_strong_arms",
+      "gracken_long_arms",
+      "gracken_shade_arms",
+      "gracken_shade_hands",
+      "gracken_sharp_nails",
+      "gracken_dextrous_hands"
+    ],
     "traits": [
       "THRESH_SPECIES_GRACKEN",
       "GRACKEN_BUILD",

From cf7b4b2f45b058d7d3433d2ad86566f830520941 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 27 Aug 2024 20:43:51 -0500
Subject: [PATCH 13/23] Apply suggestions from code review

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
---
 .../Xedra_Evolved/items/gracken_trait_improvements.json     | 2 +-
 data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index 75b969bd5a9ef..0334d933a06a5 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -49,7 +49,7 @@
     }
   },
   {
-    "id": "gracken_strong_arms",
+    "id": "gracken_long_arms",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
     "name": { "str": "Gracken Long Arms" },
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index 8fc4f4ce62c61..a85b2e5776ee7 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -4,7 +4,7 @@
     "subtype": "hobby",
     "id": "hobby_species_gracken",
     "name": "XE843 'Gracken' (Species)",
-    "description": "Species XE843 is how the Xedra scientists identified your people before they learned your people could speak to them after enough time around them to develop a way to communicate.  They had little idea that communication is your peoples survival trait, coming from a much harsher environment than the humans are…were blessed with, you can make allies with almost any thinking being.  You informed the Xedra people of your races name 'Gracken' but you didn't tell them that most of your people they found were larval forms and lacking access to the shadow materials needed would never grow up into an adult form.  Now the humans world is as deadly or moreso than your home and the way back is mostly closed.  Time to try and find a route home that wouldn't be a death sentence, or see what this world has to offer.",
+    "description": "Species XE843 is how the Xedra scientists identified your people before they learned your people could speak to them after enough time around them to develop a way to communicate.  They had little idea that communication is your people's survival trait, coming from a much harsher environment than the humans are…were blessed with, you can make allies with almost any thinking being.  You informed the Xedra people of your race's name 'Gracken' but you didn't tell them that most of your people they found were larval forms and lacking access to the shadow materials needed would never grow up into an adult form.  Now the humans' world is as deadly or moreso than your home and the way back is mostly closed.  Time to try and find a route home that wouldn't be a death sentence, or see what this world has to offer.",
     "points": 4,
     "proficiencies": [ "prof_traps" ],
     "recipes": [
@@ -42,7 +42,7 @@
     "profession": true,
     "points": 2,
     "scent_type": "sc_gracken",
-    "description": "A traveler from another dimension.  A dimension of shadows with few bright lights.  Once your species matures they gain the ability to create new alterations to their body from ingredients harvested from their kills, shadowstuff and magickal essence.",
+    "description": "A traveler from another dimension.  A dimension of shadows with few bright lights.  Once your species matures, they gain the ability to create new alterations to their body from ingredients harvested from their kills, shadowstuff and magickal essence.",
     "allowed_category": [ "GRACKEN" ],
     "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
   },
@@ -239,7 +239,7 @@
   {
     "type": "mutation",
     "id": "SHADE_EVOLUTION_GLAND",
-    "name": { "str": "Evolution Gland " },
+    "name": { "str": "Evolution Gland" },
     "points": 8,
     "purifiable": false,
     "description": "You have a gland that grows a small amount of the material needed to make biological improvements to yourself.  You must gather dreamdross and components from monsters you wish to gain the abilities of and combine them with this shadowstuff into new organs and abilities.",

From ec60df9c6acfa1136f4dfe06eaccf7f02432e66e Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 27 Aug 2024 21:32:50 -0500
Subject: [PATCH 14/23] Update
 data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json

---
 data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
index 71a4d6021192c..b0ebe9884eaf7 100644
--- a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
+++ b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
@@ -12,7 +12,7 @@
       { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
       { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] },
+      { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] }
     ]
   }
 ]

From 580ddc1f4f1b7ea5d555d47034074d593ad46fe1 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:57:34 -0500
Subject: [PATCH 15/23] Update harvest_monster_hunter_gracken.json

---
 data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
index b0ebe9884eaf7..0dd090641f67e 100644
--- a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
+++ b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
@@ -12,7 +12,7 @@
       { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
       { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "entries": [ { "item": "grappler_sinew", "mass_ratio": 0.00035 } ] }
+      { "drop": "grappler_sinew", "mass_ratio": 0.00035 }
     ]
   }
 ]

From 2da3365eef7917dc695fd7e95831d51c9db1c117 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Thu, 29 Aug 2024 00:32:19 -0500
Subject: [PATCH 16/23] Update gracken_trait_improvements.json

---
 data/mods/Xedra_Evolved/items/gracken_trait_improvements.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index 0334d933a06a5..eef3267958d6f 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -2,6 +2,7 @@
   {
     "abstract": "gracken_improvement_general",
     "type": "COMESTIBLE",
+    "comestible_type": "INVALID",
     "category": "MED",
     "name": { "str": "abstract gracken improvement" },
     "weight": "2041 g",

From 264982e8bcd167f0816a332c69b75c94384ee225 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Thu, 29 Aug 2024 18:59:35 -0500
Subject: [PATCH 17/23] Update gracken_trait_improvements.json

---
 .../items/gracken_trait_improvements.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index eef3267958d6f..445a9e2635abe 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -17,7 +17,7 @@
     "id": "gracken_shade_arms",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Shade Arms" },
+    "name": { "str_sp": "Gracken Shade Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms back to a base state.",
     "use_action": {
@@ -35,7 +35,7 @@
     "id": "gracken_strong_arms",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Strong Arms" },
+    "name": { "str_sp": "Gracken Strong Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a stronger form.",
     "use_action": {
@@ -53,7 +53,7 @@
     "id": "gracken_long_arms",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Long Arms" },
+    "name": { "str_sp": "Gracken Long Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a longer form.",
     "use_action": {
@@ -71,7 +71,7 @@
     "id": "gracken_shade_hands",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Shade Hands" },
+    "name": { "str_sp": "Gracken Shade Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands back to a base state.",
     "use_action": {
@@ -89,7 +89,7 @@
     "id": "gracken_sharp_nails",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Sharp Nails" },
+    "name": { "str_sp": "Gracken Sharp Nails" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands to a sharper form.",
     "use_action": {
@@ -107,7 +107,7 @@
     "id": "gracken_dextrous_hands",
     "copy-from": "gracken_improvement_general",
     "type": "COMESTIBLE",
-    "name": { "str": "Gracken Dextrous Hands" },
+    "name": { "str_sp": "Gracken Dextrous Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands to a more agile form.",
     "use_action": {

From 68a049030a6d42bd075dab5f6984acd8c3713f09 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:38:50 -0500
Subject: [PATCH 18/23] Update gracken_trait_improvements.json

---
 data/mods/Xedra_Evolved/items/gracken_trait_improvements.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index 445a9e2635abe..7574e06b954d8 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -115,7 +115,7 @@
       "description": "Exchanged the limb back for a longer form factor.",
       "effect_on_conditions": [
         {
-          "id": "long_arms",
+          "id": "dextrous_hands",
           "effect": [ { "u_message": "You exchanged your previous hands for these." }, { "u_add_trait": "SHADE_DEXTROUS_HANDS" } ]
         }
       ]

From be3ce30e463782882852f4af41e3d42788315ca2 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Thu, 29 Aug 2024 22:02:43 -0500
Subject: [PATCH 19/23] Update
 data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json

---
 data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
index 1ae69fef848f6..ac10a6ff1cbd3 100644
--- a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
+++ b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json
@@ -1,5 +1,6 @@
 [
   {
+    "type": "effect_on_condition",
     "id": "EOC_GRACKEN_CONVERT_RADS_TO_CALORIES",
     "recurrence": [ "5 seconds", "15 seconds" ],
     "condition": { "u_has_trait": "RADIOTROPHIC" },

From 80cdd434ff748ce4fdbd81efc06c9df02dd610d8 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Fri, 30 Aug 2024 22:36:42 -0500
Subject: [PATCH 20/23] Update category.json

---
 data/mods/Xedra_Evolved/recipes/category.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/mods/Xedra_Evolved/recipes/category.json b/data/mods/Xedra_Evolved/recipes/category.json
index 9980d077d3366..02b695fb2c7a8 100644
--- a/data/mods/Xedra_Evolved/recipes/category.json
+++ b/data/mods/Xedra_Evolved/recipes/category.json
@@ -11,6 +11,7 @@
       "CSC_XEDRA_ROBOTS",
       "CSC_XEDRA_MISC",
       "CSC_XEDRA_ALCHEMY",
+      "CSC_XEDRA_GRACKEN",
       "CSC_XEDRA_ELEMENTAL"
     ]
   },

From 2987680708ffddce73b58c772629d97cbcead8b5 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Sun, 1 Sep 2024 21:10:11 -0500
Subject: [PATCH 21/23] Update gracken_trait_improvements.json

---
 data/mods/Xedra_Evolved/items/gracken_trait_improvements.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
index 7574e06b954d8..de50bad7152f4 100644
--- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
+++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -7,7 +7,7 @@
     "name": { "str": "abstract gracken improvement" },
     "weight": "2041 g",
     "volume": "2500 ml",
-    "material": [ "demihuman_flesh", "shadowstuff" ],
+    "material": [ "flesh", "shadowstuff" ],
     "symbol": "!",
     "color": "light_gray",
     "price_postapoc": "10 USD",

From 6d2c39eccf5c09f516f1f83553d0d507ee259529 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 3 Sep 2024 00:18:09 -0500
Subject: [PATCH 22/23] Update gracken_spells.json

---
 data/mods/Xedra_Evolved/mutations/gracken_spells.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/Xedra_Evolved/mutations/gracken_spells.json b/data/mods/Xedra_Evolved/mutations/gracken_spells.json
index 6caade62217cd..7d61a7728156d 100644
--- a/data/mods/Xedra_Evolved/mutations/gracken_spells.json
+++ b/data/mods/Xedra_Evolved/mutations/gracken_spells.json
@@ -3,8 +3,8 @@
     "id": "gracken_arm_push_spell",
     "type": "SPELL",
     "name": "Gracken Long Arms Spell",
-    "description": "Push a target to you.",
-    "message": "",
+    "description": "Push a target away from you.",
+    "message": "You extend your arms and push the %s away from you!",
     "valid_targets": [ "hostile" ],
     "flags": [ "SILENT" ],
     "effect": "directed_push",

From c48f8f174ef75ffa17617dbf9b9ebf5178c751a2 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:07:51 -0500
Subject: [PATCH 23/23] Fixes

---
 .../Xedra_Evolved/items/armor/integrated.json |  2 +-
 .../mutations/mutation_category.json          |  4 +++
 .../mutations/xe_playable_gracken.json        | 30 +++++++++----------
 data/mods/Xedra_Evolved/skills.json           |  8 -----
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
index 085acaa5ccc03..d07da889a0359 100644
--- a/data/mods/Xedra_Evolved/items/armor/integrated.json
+++ b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -534,7 +534,7 @@
     "name": { "str": "shadowstuff organ" },
     "description": "You have an organ inside of your body that grows a material you can create improved versions of your body parts with.  You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.",
     "to_hit": -1,
-    "material": [ "demihuman_flesh" ],
+    "material": [ "flesh" ],
     "symbol": ")",
     "color": "light_gray",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "scrap_shadowstuff": 3 }, "airtight": true } ],
diff --git a/data/mods/Xedra_Evolved/mutations/mutation_category.json b/data/mods/Xedra_Evolved/mutations/mutation_category.json
index ad0d9e3dda722..1af331b66da12 100644
--- a/data/mods/Xedra_Evolved/mutations/mutation_category.json
+++ b/data/mods/Xedra_Evolved/mutations/mutation_category.json
@@ -53,6 +53,10 @@
     "vitamin": "mutagen_dollkin",
     "memorial_message": "Real enough for you?"
   },
+  {
+    "type": "mutation_type",
+    "id": "STOMACH"
+  },
   {
     "type": "mutation_type",
     "id": "MANA_ADD"
diff --git a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
index a85b2e5776ee7..d7c481a4c3e0e 100644
--- a/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
+++ b/data/mods/Xedra_Evolved/mutations/xe_playable_gracken.json
@@ -41,7 +41,6 @@
     "purifiable": false,
     "profession": true,
     "points": 2,
-    "scent_type": "sc_gracken",
     "description": "A traveler from another dimension.  A dimension of shadows with few bright lights.  Once your species matures, they gain the ability to create new alterations to their body from ingredients harvested from their kills, shadowstuff and magickal essence.",
     "allowed_category": [ "GRACKEN" ],
     "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
@@ -56,18 +55,6 @@
     "purifiable": false,
     "threshold": true
   },
-  {
-    "id": "mutagen_species_gracken",
-    "type": "vitamin",
-    "vit_type": "counter",
-    "//": "Nothing should give this currently, Gracken only use this to mature and only mature Gracken are playable currently.  If someone comes up with a decent plan on maturing larval Gracken into adults remove this note.",
-    "name": { "str": "Gracken Purifier" },
-    "excess": "mutagen_species_gracken",
-    "min": 0,
-    "max": 2500,
-    "rate": "1 h",
-    "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
-  },
   {
     "type": "mutation",
     "id": "NIGHTVISION",
@@ -139,7 +126,7 @@
     "type": "mutation",
     "id": "SHADE_STRONG_ARMS",
     "name": { "str": "Strong Arms" },
-    "description": "Your arms have begun bulking up and become stronger. +1 Strength",
+    "description": "Your arms have begun bulking up and become stronger.  +1 Strength",
     "//": "This is the first stage strong arms mutation.",
     "types": [ "ARMS" ],
     "prereqs": [ "SHADE_ARMS" ],
@@ -156,7 +143,7 @@
     "type": "mutation",
     "id": "SHADE_LONG_ARMS",
     "name": { "str": "Long Arms" },
-    "description": "Your arms have lengthened. You can push a target away from you.",
+    "description": "Your arms have lengthened.  You can push a target away from you.",
     "//": "This is the first stage long arms mutation.",
     "types": [ "ARMS" ],
     "purifiable": false,
@@ -220,6 +207,19 @@
     "category": [ "GRACKEN" ],
     "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
   },
+  {
+    "type": "mutation",
+    "id": "SHADE_SKIN",
+    "name": { "str": "Shade Skin" },
+    "description": "Your skin is the color of shadows moving in the twilight.",
+    "//": "This is the baseline Gracken skin mutation.",
+    "types": [ "SKIN" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "category": [ "GRACKEN" ],
+    "threshreq": [ "THRESH_SPECIES_GRACKEN" ]
+  },
   {
     "type": "mutation",
     "id": "SHADE_STOMACH",
diff --git a/data/mods/Xedra_Evolved/skills.json b/data/mods/Xedra_Evolved/skills.json
index f6cf609a9154e..66b5741052473 100644
--- a/data/mods/Xedra_Evolved/skills.json
+++ b/data/mods/Xedra_Evolved/skills.json
@@ -10,13 +10,5 @@
     "display_category": "display_interaction",
     "sort_rank": 26500,
     "companion_skill_practice": [ { "skill": "speech", "weight": 1 }, { "skill": "devices", "weight": 1 } ]
-  },
-  {
-    "type": "skill",
-    "id": "spellcraft",
-    "name": "spellcraft",
-    "display_category": "display_ranged",
-    "sort_rank": 14500,
-    "description": "Your skill in the arcane.  Represents magic theory and all that entails.  A higher skill increases how quickly you can learn spells, and decreases their spell failure chance.  You learn this skill by studying books or spells."
   }
 ]