From ea8c90835aa598af425aa14b5014d545a96adf40 Mon Sep 17 00:00:00 2001
From: IllianiBird <danielfarbrace@icloud.com>
Date: Sat, 1 Aug 2026 19:12:54 -0400
Subject: [PATCH 1/2] Edit dialog & data

---
 data/universe/defaultspa.xml | 280 +++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)

diff --git a/data/universe/defaultspa.xml b/data/universe/defaultspa.xml
index 76da55df62..30012ab814 100644
--- a/data/universe/defaultspa.xml
+++ b/data/universe/defaultspa.xml
@@ -550,6 +550,286 @@
             <skill>Piloting/Aircraft::Green</skill>
         </skillPrereq>
     </ability>
+    <!-- Tech weight-class Affinity / Antipathy / Specialist (Unofficial) -->
+    <ability>
+        <lookupName>tech_mek_affinity_light</lookupName>
+        <displayName>Tech 'Mek Affinity: Light (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a light 'Mek.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_antipathy_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_antipathy_light</lookupName>
+        <displayName>Tech 'Mek Antipathy: Light (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a light 'Mek.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_affinity_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_affinity_medium</lookupName>
+        <displayName>Tech 'Mek Affinity: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a medium 'Mek.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_antipathy_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_antipathy_medium</lookupName>
+        <displayName>Tech 'Mek Antipathy: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a medium 'Mek.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_affinity_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_affinity_heavy</lookupName>
+        <displayName>Tech 'Mek Affinity: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a heavy 'Mek.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_antipathy_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_antipathy_heavy</lookupName>
+        <displayName>Tech 'Mek Antipathy: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a heavy 'Mek.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_affinity_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_affinity_assault</lookupName>
+        <displayName>Tech 'Mek Affinity: Assault (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining an assault 'Mek.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_antipathy_assault::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_mek_antipathy_assault</lookupName>
+        <displayName>Tech 'Mek Antipathy: Assault (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining an assault 'Mek.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_affinity_assault::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mek</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_affinity_light</lookupName>
+        <displayName>Tech Vehicular Affinity: Light (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a light combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_antipathy_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_antipathy_light</lookupName>
+        <displayName>Tech Vehicular Antipathy: Light (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a light combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_affinity_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_affinity_medium</lookupName>
+        <displayName>Tech Vehicular Affinity: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a medium combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_antipathy_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_antipathy_medium</lookupName>
+        <displayName>Tech Vehicular Antipathy: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a medium combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_affinity_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_affinity_heavy</lookupName>
+        <displayName>Tech Vehicular Affinity: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a heavy combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_antipathy_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_antipathy_heavy</lookupName>
+        <displayName>Tech Vehicular Antipathy: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a heavy combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_affinity_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_affinity_assault</lookupName>
+        <displayName>Tech Vehicular Affinity: Assault (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining an assault combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_antipathy_assault::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_vehicular_antipathy_assault</lookupName>
+        <displayName>Tech Vehicular Antipathy: Assault (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining an assault combat vehicle (ground, naval, or VTOL).]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_vehicular_affinity_assault::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Mechanic</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_affinity_light</lookupName>
+        <displayName>Tech Flight Affinity: Light (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a light conventional or aerospace fighter.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_antipathy_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_antipathy_light</lookupName>
+        <displayName>Tech Flight Antipathy: Light (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a light conventional or aerospace fighter.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_affinity_light::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_affinity_medium</lookupName>
+        <displayName>Tech Flight Affinity: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a medium conventional or aerospace fighter.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_antipathy_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_antipathy_medium</lookupName>
+        <displayName>Tech Flight Antipathy: Medium (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a medium conventional or aerospace fighter.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_affinity_medium::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_affinity_heavy</lookupName>
+        <displayName>Tech Flight Affinity: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Gain a +1 bonus to Maintenance rolls while maintaining a heavy conventional or aerospace fighter.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_antipathy_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_flight_antipathy_heavy</lookupName>
+        <displayName>Tech Flight Antipathy: Heavy (Unofficial)</displayName>
+        <desc><![CDATA[Suffer a -1 penalty to Maintenance rolls while maintaining a heavy conventional or aerospace fighter.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_flight_affinity_heavy::tech_unit_specialist</invalidAbilities>
+        <skillPrereq>
+            <skill>Tech/Aero</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>tech_unit_specialist</lookupName>
+        <displayName>Tech Specialist (Unofficial)</displayName>
+        <desc><![CDATA[Choose a unit type and weight class as your specialty. While maintaining a matching unit you gain a +1 bonus to both Maintenance and Repair rolls; while maintaining any other unit you suffer a -1 penalty to both.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>tech_mek_affinity_light::tech_mek_antipathy_light::tech_mek_affinity_medium::tech_mek_antipathy_medium::tech_mek_affinity_heavy::tech_mek_antipathy_heavy::tech_mek_affinity_assault::tech_mek_antipathy_assault::tech_vehicular_affinity_light::tech_vehicular_antipathy_light::tech_vehicular_affinity_medium::tech_vehicular_antipathy_medium::tech_vehicular_affinity_heavy::tech_vehicular_antipathy_heavy::tech_vehicular_affinity_assault::tech_vehicular_antipathy_assault::tech_flight_affinity_light::tech_flight_antipathy_light::tech_flight_affinity_medium::tech_flight_antipathy_medium::tech_flight_affinity_heavy::tech_flight_antipathy_heavy</invalidAbilities>
+        <choiceValues>'Mek: Light::'Mek: Medium::'Mek: Heavy::'Mek: Assault::Vehicular: Light::Vehicular: Medium::Vehicular: Heavy::Vehicular: Assault::Flight: Light::Flight: Medium::Flight: Heavy</choiceValues>
+        <skillPrereq>
+            <skill>Tech/Mek::Green</skill>
+            <skill>Tech/Mechanic::Green</skill>
+            <skill>Tech/Aero::Green</skill>
+        </skillPrereq>
+    </ability>
     <ability>
         <lookupName>shaky_stick</lookupName>
         <xpCost>100</xpCost>

From 9d947dff2c7bfb1fc31b8c05ac1d7e003414d5af Mon Sep 17 00:00:00 2001
From: IllianiBird <danielfarbrace@icloud.com>
Date: Sun, 2 Aug 2026 11:19:41 -0400
Subject: [PATCH 2/2] Added two Familiarity SPAs

---
 data/universe/defaultspa.xml | 51 ++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/data/universe/defaultspa.xml b/data/universe/defaultspa.xml
index 30012ab814..30f93433bd 100644
--- a/data/universe/defaultspa.xml
+++ b/data/universe/defaultspa.xml
@@ -165,8 +165,53 @@
             <skill>Piloting/Mek::Regular</skill>
         </skillPrereq>
     </ability>
-    <!-- 'Mek Affinity / Antipathy (Unofficial). Weight-class-specific Piloting/Mek modifier applied to the deployed
-         crew in MekHQ (Unit.resetPilotAndEntity), since these SPAs are not known to MegaMek. -->
+    <ability>
+        <lookupName>familiarity_emotionally_unavailable</lookupName>
+        <displayName>Emotionally Unavailable (Unofficial)</displayName>
+        <desc><![CDATA[The character cannot earn Familiarity for any chassis they do not already have some Familiarity with.
+
+Has no effect if Chassis Familiarity is disabled.]]></desc>
+        <xpCost>-100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>familiarity_free_love</invalidAbilities>
+        <skillPrereq>
+            <skill>Gunnery/Mek</skill>
+            <skill>Gunnery/Vehicle</skill>
+            <skill>Gunnery/Aerospace</skill>
+            <skill>Gunnery/Aircraft</skill>
+            <skill>Piloting/Mek</skill>
+            <skill>Piloting/Ground Vehicle</skill>
+            <skill>Piloting/Naval</skill>
+            <skill>Piloting/VTOL</skill>
+            <skill>Piloting/Aerospace</skill>
+            <skill>Piloting/Aircraft</skill>
+        </skillPrereq>
+    </ability>
+    <ability>
+        <lookupName>familiarity_iron_bond</lookupName>
+        <displayName>Iron Bond (Unofficial)</displayName>
+        <desc><![CDATA[The character increases all Familiarity gains by 50%.
+
+Has no effect if Chassis Familiarity is disabled.]]></desc>
+        <xpCost>100</xpCost>
+        <originOnly>false</originOnly>
+        <weight>1</weight>
+        <invalidAbilities>familiarity_one_love</invalidAbilities>
+        <skillPrereq>
+            <skill>Gunnery/Mek</skill>
+            <skill>Gunnery/Vehicle</skill>
+            <skill>Gunnery/Aerospace</skill>
+            <skill>Gunnery/Aircraft</skill>
+            <skill>Piloting/Mek</skill>
+            <skill>Piloting/Ground Vehicle</skill>
+            <skill>Piloting/Naval</skill>
+            <skill>Piloting/VTOL</skill>
+            <skill>Piloting/Aerospace</skill>
+            <skill>Piloting/Aircraft</skill>
+        </skillPrereq>
+    </ability>
+    <!-- 'Mek Affinity / Antipathy (Unofficial) -->
     <ability>
         <lookupName>mek_affinity_light</lookupName>
         <displayName>'Mek Affinity: Light (Unofficial)</displayName>
@@ -542,6 +587,8 @@
             <skill>Gunnery/Vehicle::Green</skill>
             <skill>Gunnery/Aerospace::Green</skill>
             <skill>Gunnery/Aircraft::Green</skill>
+        </skillPrereq>
+        <skillPrereq>
             <skill>Piloting/Mek::Green</skill>
             <skill>Piloting/Ground Vehicle::Green</skill>
             <skill>Piloting/Naval::Green</skill>