From 01249dfd9ce9376ffd1abddc414aa2cd6757f3f2 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Thu, 10 Sep 2020 03:28:36 +0300
Subject: [PATCH 1/2] Validate presence of mutaplasmid item

---
 eos/saveddata/module.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 23580ad1a..ddbf90d7e 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -198,11 +198,18 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         # todo: validate baseItem as well if it's set.
         if self.isEmpty:
             return False
-        return (
-            self.__item is None or (
-                self.__item.category.name not in ("Module", "Subsystem", "Structure Module") and
-                self.__item.group.name not in self.SYSTEM_GROUPS) or
-            (self.item.isAbyssal and not self.isMutated))
+        if self.__item is None:
+            return True
+        if (
+            self.__item.category.name not in ("Module", "Subsystem", "Structure Module")
+            and self.__item.group.name not in self.SYSTEM_GROUPS
+        ):
+            return True
+        if self.item.isAbyssal and not self.isMutated:
+            return True
+        if self.isMutated and not self.__mutaplasmid:
+            return True
+        return False
 
     @property
     def isMutated(self):

From 7bff295012a9a2b975069ddc53b9a8787f0a646d Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Thu, 10 Sep 2020 03:55:52 +0300
Subject: [PATCH 2/2] Add some jargon definitions for capital mods with numbers

---
 service/jargon/defaults.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml
index 80d3b3e04..ea3f14dc2 100644
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -627,6 +627,15 @@ laar:
 caar:
   - 'caar'
   - 'capital ancillary (.+ )?(?<!remote )armor repairer'
+25k:
+  - '25k'
+  - '25000'
+25kmm:
+  - '25kmm'
+  - '25000mm'
+25m:
+  - '25m'
+  - '25000mm'
 
 # Hull modules
 dc:
@@ -649,6 +658,18 @@ cehe:
   - 'capital (.+ )?emergency hull energizer'
 
 # Propulsion modules and upgrades
+10k:
+  - '10k'
+  - '10000'
+10kmn:
+  - '10kmn'
+  - '10000mn'
+50k:
+  - '50k'
+  - '50000'
+50kmn:
+  - '50kmn'
+  - '50000mn'
 ab:
   - '(^| )ab'  # Checking only beginning of a word to remove unwanted spam
   - 'afterburner'