diff --git a/megamek/data/canonUnitQuirks.xml b/megamek/data/canonUnitQuirks.xml
index f282d291918..a849ca45312 100644
--- a/megamek/data/canonUnitQuirks.xml
+++ b/megamek/data/canonUnitQuirks.xml
@@ -2880,7 +2880,19 @@ Example: You can define quirks that affect all units of a given chassis and then
BSW-S2r
Mech
low_profile
- no_twist
+
+
+
+ Bushwacker
+ BSW-X4
+ Mech
+ low_profile
+
+ stable_weapon
+ CT
+ 10
+ ISERLargeLaser
+
@@ -2888,7 +2900,6 @@ Example: You can define quirks that affect all units of a given chassis and then
BSW-X1
Mech
low_profile
- no_twist
stable_weapon
CT
@@ -2902,7 +2913,6 @@ Example: You can define quirks that affect all units of a given chassis and then
BSW-S2
Mech
low_profile
- no_twist
stable_weapon
CT
@@ -2916,7 +2926,6 @@ Example: You can define quirks that affect all units of a given chassis and then
BSW-X2
Mech
low_profile
- no_twist
@@ -12090,7 +12099,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-5WB
Mech
imp_com
- no_twist
@@ -12098,7 +12106,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3KB
Mech
imp_com
- no_twist
ammo_feed_problems
RT
@@ -12112,7 +12119,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3L
Mech
imp_com
- no_twist
ammo_feed_problems
RT
@@ -12126,7 +12132,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-C
Mech
imp_com
- no_twist
ammo_feed_problems
RT
@@ -12140,7 +12145,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3Lb
Mech
imp_com
- no_twist
@@ -12148,7 +12152,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3M
Mech
imp_com
- no_twist
ammo_feed_problems
RT
@@ -12161,8 +12164,6 @@ Example: You can define quirks that affect all units of a given chassis and then
Sentinel
STN-4D
Mech
- imp_com
- no_twist
@@ -12170,7 +12171,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-1S
Mech
imp_com
- no_twist
@@ -12178,7 +12178,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3K
Mech
imp_com
- no_twist
ammo_feed_problems
RT
@@ -12192,7 +12191,6 @@ Example: You can define quirks that affect all units of a given chassis and then
STN-3KA
Mech
imp_com
- no_twist
ammo_feed_problems
RT
diff --git a/megamek/data/images/units/mechs/Hellion A.png b/megamek/data/images/units/mechs/Hellion A.png
deleted file mode 100644
index 8cc09de8661..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion A.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion B.png b/megamek/data/images/units/mechs/Hellion B.png
deleted file mode 100644
index 2a3cd76047d..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion B.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion C.png b/megamek/data/images/units/mechs/Hellion C.png
deleted file mode 100644
index 800ea3eeee4..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion D.png b/megamek/data/images/units/mechs/Hellion D.png
deleted file mode 100644
index 5fadda9bdb7..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion D.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion E.png b/megamek/data/images/units/mechs/Hellion E.png
deleted file mode 100644
index c1c9c874056..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion E.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion F.png b/megamek/data/images/units/mechs/Hellion F.png
deleted file mode 100644
index a337070cfc7..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion F.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion G.png b/megamek/data/images/units/mechs/Hellion G.png
deleted file mode 100644
index f5350a2f0b0..00000000000
Binary files a/megamek/data/images/units/mechs/Hellion G.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Hellion.png b/megamek/data/images/units/mechs/Hellion.png
index f91fa0f34d3..4f867369d32 100644
Binary files a/megamek/data/images/units/mechs/Hellion.png and b/megamek/data/images/units/mechs/Hellion.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_A.png b/megamek/data/images/units/mechs/Hellion_A.png
new file mode 100644
index 00000000000..1ee3a90f46b
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_A.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_B.png b/megamek/data/images/units/mechs/Hellion_B.png
new file mode 100644
index 00000000000..1e3287f9b75
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_B.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_C.png b/megamek/data/images/units/mechs/Hellion_C.png
new file mode 100644
index 00000000000..34ae7795c70
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_C.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_D.png b/megamek/data/images/units/mechs/Hellion_D.png
new file mode 100644
index 00000000000..a8066efda5a
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_D.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_E.png b/megamek/data/images/units/mechs/Hellion_E.png
new file mode 100644
index 00000000000..58dd40d9417
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_E.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_F.png b/megamek/data/images/units/mechs/Hellion_F.png
new file mode 100644
index 00000000000..be8c4d95c7e
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_F.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_G.png b/megamek/data/images/units/mechs/Hellion_G.png
new file mode 100644
index 00000000000..eeef951cdbd
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_G.png differ
diff --git a/megamek/data/images/units/mechs/Hellion_P.png b/megamek/data/images/units/mechs/Hellion_P.png
new file mode 100644
index 00000000000..46c472e4731
Binary files /dev/null and b/megamek/data/images/units/mechs/Hellion_P.png differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-0C.png b/megamek/data/images/units/mechs/Longbow LGB-0C.png
deleted file mode 100644
index 0482d826d2b..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-0C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-0W.png b/megamek/data/images/units/mechs/Longbow LGB-0W.png
deleted file mode 100644
index 4ef1f8c0ebf..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-0W.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-12C.png b/megamek/data/images/units/mechs/Longbow LGB-12C.png
deleted file mode 100644
index 3646b33905d..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-12C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-12R.png b/megamek/data/images/units/mechs/Longbow LGB-12R.png
deleted file mode 100644
index af1f1898728..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-12R.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-13C.png b/megamek/data/images/units/mechs/Longbow LGB-13C.png
deleted file mode 100644
index 07d9b510351..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-13C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-13NAIS.png b/megamek/data/images/units/mechs/Longbow LGB-13NAIS.png
deleted file mode 100644
index 73628b4c470..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-13NAIS.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-14C.png b/megamek/data/images/units/mechs/Longbow LGB-14C.png
deleted file mode 100644
index abf52176952..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-14C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-7V.png b/megamek/data/images/units/mechs/Longbow LGB-7V.png
deleted file mode 100644
index 53c1c3ed4e7..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-7V.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow LGB-8V.png b/megamek/data/images/units/mechs/Longbow LGB-8V.png
deleted file mode 100644
index 79aebe60696..00000000000
Binary files a/megamek/data/images/units/mechs/Longbow LGB-8V.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Longbow.png b/megamek/data/images/units/mechs/Longbow.png
index 064910fde01..677a5bfa0f7 100644
Binary files a/megamek/data/images/units/mechs/Longbow.png and b/megamek/data/images/units/mechs/Longbow.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_0C.png b/megamek/data/images/units/mechs/Longbow_0C.png
new file mode 100644
index 00000000000..b8f7a62bb56
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_0C.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_0H.png b/megamek/data/images/units/mechs/Longbow_0H.png
new file mode 100644
index 00000000000..155f946447e
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_0H.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_0W.png b/megamek/data/images/units/mechs/Longbow_0W.png
new file mode 100644
index 00000000000..96fcb04d8a0
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_0W.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_10K.png b/megamek/data/images/units/mechs/Longbow_10K.png
new file mode 100644
index 00000000000..18b7a575949
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_10K.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_12C.png b/megamek/data/images/units/mechs/Longbow_12C.png
new file mode 100644
index 00000000000..0c1b1c96b03
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_12C.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_12R.png b/megamek/data/images/units/mechs/Longbow_12R.png
new file mode 100644
index 00000000000..fa00623152f
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_12R.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_13C.png b/megamek/data/images/units/mechs/Longbow_13C.png
new file mode 100644
index 00000000000..fb6474f3b37
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_13C.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_13NAIS.png b/megamek/data/images/units/mechs/Longbow_13NAIS.png
new file mode 100644
index 00000000000..f5265745abd
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_13NAIS.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_14C.png b/megamek/data/images/units/mechs/Longbow_14C.png
new file mode 100644
index 00000000000..46c85dd34b6
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_14C.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_14V.png b/megamek/data/images/units/mechs/Longbow_14V.png
new file mode 100644
index 00000000000..2ba4db4c5d5
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_14V.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_7V.png b/megamek/data/images/units/mechs/Longbow_7V.png
new file mode 100644
index 00000000000..a938b3413d1
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_7V.png differ
diff --git a/megamek/data/images/units/mechs/Longbow_8V.png b/megamek/data/images/units/mechs/Longbow_8V.png
new file mode 100644
index 00000000000..6697d366df0
Binary files /dev/null and b/megamek/data/images/units/mechs/Longbow_8V.png differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) A.png b/megamek/data/images/units/mechs/Masakari (Warhawk) A.png
deleted file mode 100644
index dd6375566ea..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) A.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) B.png b/megamek/data/images/units/mechs/Masakari (Warhawk) B.png
deleted file mode 100644
index f86f900ff74..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) B.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) C.png b/megamek/data/images/units/mechs/Masakari (Warhawk) C.png
deleted file mode 100644
index 159bb5c48ab..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) C.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) D.png b/megamek/data/images/units/mechs/Masakari (Warhawk) D.png
deleted file mode 100644
index e9d57a09ea3..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) D.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) E.png b/megamek/data/images/units/mechs/Masakari (Warhawk) E.png
deleted file mode 100644
index cbb00667d98..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) E.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) F.png b/megamek/data/images/units/mechs/Masakari (Warhawk) F.png
deleted file mode 100644
index 1785aea45f7..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) F.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk) H.png b/megamek/data/images/units/mechs/Masakari (Warhawk) H.png
deleted file mode 100644
index 4fc40d625ef..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk) H.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari (Warhawk).png b/megamek/data/images/units/mechs/Masakari (Warhawk).png
deleted file mode 100644
index 4bbb7de5802..00000000000
Binary files a/megamek/data/images/units/mechs/Masakari (Warhawk).png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Masakari.png b/megamek/data/images/units/mechs/Masakari.png
new file mode 100644
index 00000000000..5e512c773c9
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_A.png b/megamek/data/images/units/mechs/Masakari_A.png
new file mode 100644
index 00000000000..1957a59067c
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_A.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_B.png b/megamek/data/images/units/mechs/Masakari_B.png
new file mode 100644
index 00000000000..d73a6d0f8c2
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_B.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_C.png b/megamek/data/images/units/mechs/Masakari_C.png
new file mode 100644
index 00000000000..85cee374d21
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_C.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_D.png b/megamek/data/images/units/mechs/Masakari_D.png
new file mode 100644
index 00000000000..15a76699ced
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_D.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_E.png b/megamek/data/images/units/mechs/Masakari_E.png
new file mode 100644
index 00000000000..f5fc9cf0259
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_E.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_F.png b/megamek/data/images/units/mechs/Masakari_F.png
new file mode 100644
index 00000000000..1118b3c0060
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_F.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_G.png b/megamek/data/images/units/mechs/Masakari_G.png
new file mode 100644
index 00000000000..2846956e5bb
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_G.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_H.png b/megamek/data/images/units/mechs/Masakari_H.png
new file mode 100644
index 00000000000..4427b97e3b1
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_H.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_I.png b/megamek/data/images/units/mechs/Masakari_I.png
new file mode 100644
index 00000000000..8e9af6c0818
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_I.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_L.png b/megamek/data/images/units/mechs/Masakari_L.png
new file mode 100644
index 00000000000..845f34b6bcb
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_L.png differ
diff --git a/megamek/data/images/units/mechs/Masakari_T.png b/megamek/data/images/units/mechs/Masakari_T.png
new file mode 100644
index 00000000000..e1040c834a6
Binary files /dev/null and b/megamek/data/images/units/mechs/Masakari_T.png differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 2.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 2.png
deleted file mode 100644
index 43c9bd5a57d..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 2.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 3.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 3.png
deleted file mode 100644
index 2c9874f01f2..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 3.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 4.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 4.png
deleted file mode 100644
index 1bcf2c6ac4f..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 4.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 5.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 5.png
deleted file mode 100644
index 88856d6623b..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 5.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 6.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 6.png
deleted file mode 100644
index 465f6776875..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 6.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 7.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 7.png
deleted file mode 100644
index 47fa599a104..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 7.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 8.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 8.png
deleted file mode 100644
index 51d05ea4977..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 8.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC 9.png b/megamek/data/images/units/mechs/Shadow Hawk IIC 9.png
deleted file mode 100644
index 23fcbd30a92..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC 9.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/Shadow Hawk IIC.png b/megamek/data/images/units/mechs/Shadow Hawk IIC.png
deleted file mode 100644
index c36045a58ad..00000000000
Binary files a/megamek/data/images/units/mechs/Shadow Hawk IIC.png and /dev/null differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC.png b/megamek/data/images/units/mechs/ShadowhawkIIC.png
new file mode 100644
index 00000000000..cb1b10c7d97
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_10.png b/megamek/data/images/units/mechs/ShadowhawkIIC_10.png
new file mode 100644
index 00000000000..b8aeaeaa313
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_10.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_2.png b/megamek/data/images/units/mechs/ShadowhawkIIC_2.png
new file mode 100644
index 00000000000..0eefb33510d
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_2.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_3.png b/megamek/data/images/units/mechs/ShadowhawkIIC_3.png
new file mode 100644
index 00000000000..ccf907e62b4
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_3.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_4.png b/megamek/data/images/units/mechs/ShadowhawkIIC_4.png
new file mode 100644
index 00000000000..625ace0574c
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_4.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_5.png b/megamek/data/images/units/mechs/ShadowhawkIIC_5.png
new file mode 100644
index 00000000000..3d28215154a
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_5.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_6.png b/megamek/data/images/units/mechs/ShadowhawkIIC_6.png
new file mode 100644
index 00000000000..ba050785f94
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_6.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_7.png b/megamek/data/images/units/mechs/ShadowhawkIIC_7.png
new file mode 100644
index 00000000000..8c09b83a708
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_7.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_8.png b/megamek/data/images/units/mechs/ShadowhawkIIC_8.png
new file mode 100644
index 00000000000..9c53920f36b
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_8.png differ
diff --git a/megamek/data/images/units/mechs/ShadowhawkIIC_9.png b/megamek/data/images/units/mechs/ShadowhawkIIC_9.png
new file mode 100644
index 00000000000..e1a90932fb2
Binary files /dev/null and b/megamek/data/images/units/mechs/ShadowhawkIIC_9.png differ
diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
index 1979a338d75..ba2541640ce 100644
--- a/megamek/data/images/units/mechset.txt
+++ b/megamek/data/images/units/mechset.txt
@@ -1934,13 +1934,14 @@ exact "Hellhound (Conjurer) 4" "mechs/Hellhound_4.png"
exact "Hellhound (Conjurer) 5" "mechs/Hellhound_5.png"
exact "Hellhound (Conjurer) 8" "mechs/Hellhound_8.png"
chassis "Hellion" "mechs/Hellion.png"
-exact "Hellion A" "mechs/Hellion A.png"
-exact "Hellion B" "mechs/Hellion B.png"
-exact "Hellion C" "mechs/Hellion C.png"
-exact "Hellion D" "mechs/Hellion D.png"
-exact "Hellion E" "mechs/Hellion E.png"
-exact "Hellion F" "mechs/Hellion F.png"
-exact "Hellion G" "mechs/Hellion G.png"
+exact "Hellion A" "mechs/Hellion_A.png"
+exact "Hellion B" "mechs/Hellion_B.png"
+exact "Hellion C" "mechs/Hellion_C.png"
+exact "Hellion D" "mechs/Hellion_D.png"
+exact "Hellion E" "mechs/Hellion_E.png"
+exact "Hellion F" "mechs/Hellion_F.png"
+exact "Hellion G" "mechs/Hellion_G.png"
+exact "Hellion P" "mechs/Hellion_P.png"
chassis "Hellspawn" "mechs/Hellspawn.png"
exact "Hellspawn HSN-9F" "mechs/Hellspawn_9F.png"
exact "Hellspawn HSN-10G" "mechs/Hellspawn_10G.png"
@@ -2369,16 +2370,20 @@ chassis "Loki Mk II (Hel)" "mechs/Loki MkII.png"
exact "Loki Mk II (Hel) A" "mechs/Loki MkIIA.png"
exact "Loki Mk II (Hel) B" "mechs/Loki MkIIB.png"
chassis "Longbow" "mechs/Longbow.png"
-exact "Longbow LGB-0C" "mechs/Longbow LGB-0C.png"
-exact "Longbow LGB-0W" "mechs/Longbow LGB-0W.png"
-exact "Longbow LGB-7V" "mechs/Longbow LGB-7V.png"
-exact "Longbow LGB-8V" "mechs/Longbow LGB-8V.png"
-exact "Longbow LGB-12C" "mechs/Longbow LGB-12C.png"
-exact "Longbow LGB-12R" "mechs/Longbow LGB-12R.png"
-exact "Longbow LGB-13C" "mechs/Longbow LGB-13C.png"
-exact "Longbow LGB-13NAIS" "mechs/Longbow LGB-13NAIS.png"
-exact "Longbow LGB-14C" "mechs/Longbow LGB-14C.png"
-exact "Longbow LGB-14C2" "mechs/Longbow LGB-14C.png"
+exact "Longbow LGB-0C" "mechs/Longbow_0C.png"
+exact "Longbow LGB-0H" "mechs/Longbow_0H.png"
+exact "Longbow LGB-0W" "mechs/Longbow_0W.png"
+exact "Longbow LGB-0W2" "mechs/Longbow_0W.png"
+exact "Longbow LGB-7V" "mechs/Longbow_7V.png"
+exact "Longbow LGB-8V" "mechs/Longbow_8V.png"
+exact "Longbow LGB-10K" "mechs/Longbow_10K.png"
+exact "Longbow LGB-12C" "mechs/Longbow_12C.png"
+exact "Longbow LGB-12R" "mechs/Longbow_12R.png"
+exact "Longbow LGB-13C" "mechs/Longbow_13C.png"
+exact "Longbow LGB-13NAIS" "mechs/Longbow_13NAIS.png"
+exact "Longbow LGB-14C" "mechs/Longbow_14C.png"
+exact "Longbow LGB-14C2" "mechs/Longbow_14C.png"
+exact "Longbow LGB-14V" "mechs/Longbow_14V.png"
chassis "Longshot" "mechs/Longshot.png"
exact "Longshot LNG-1B" "mechs/Longshot LNG-1B.png"
exact "Longshot LNG-3" "mechs/Longshot LNG-3.png"
@@ -2556,14 +2561,18 @@ chassis "Marshal" "mechs/Marshal.png"
exact "Marshal MHL-2L" "mechs/Marshal MHL-2L.png"
exact "Marshal MHL-3MC" "mechs/Marshal MHL-3MC.png"
exact "Marshal MHL-6MC" "mechs/Marshal MHL-6MC.png"
-chassis "Masakari (Warhawk)" "mechs/Masakari (Warhawk).png"
-exact "Masakari (Warhawk) A" "mechs/Masakari (Warhawk) A.png"
-exact "Masakari (Warhawk) B" "mechs/Masakari (Warhawk) B.png"
-exact "Masakari (Warhawk) C" "mechs/Masakari (Warhawk) C.png"
-exact "Masakari (Warhawk) D" "mechs/Masakari (Warhawk) D.png"
-exact "Masakari (Warhawk) E" "mechs/Masakari (Warhawk) E.png"
-exact "Masakari (Warhawk) F" "mechs/Masakari (Warhawk) F.png"
-exact "Masakari (Warhawk) H" "mechs/Masakari (Warhawk) H.png"
+chassis "Masakari (Warhawk)" "mechs/Masakari.png"
+exact "Masakari (Warhawk) A" "mechs/Masakari_A.png"
+exact "Masakari (Warhawk) B" "mechs/Masakari_B.png"
+exact "Masakari (Warhawk) C" "mechs/Masakari_C.png"
+exact "Masakari (Warhawk) D" "mechs/Masakari_D.png"
+exact "Masakari (Warhawk) E" "mechs/Masakari_E.png"
+exact "Masakari (Warhawk) F" "mechs/Masakari_F.png"
+exact "Masakari (Warhawk) G" "mechs/Masakari_G.png"
+exact "Masakari (Warhawk) H" "mechs/Masakari_H.png"
+exact "Masakari (Warhawk) I" "mechs/Masakari_I.png"
+exact "Masakari (Warhawk) L" "mechs/Masakari_L.png"
+exact "Masakari (Warhawk) T" "mechs/Masakari_T.png"
chassis "Masauwu" "mechs/Masauwu.png"
chassis "Matador" "mechs/Matador.png"
exact "Matador 2" "mechs/Matador 2.png"
@@ -3310,15 +3319,16 @@ exact "Shadow Hawk SHD-11CS2" "mechs/Shadowhawk_11CS.png"
exact "Shadow Hawk SHD-12C" "mechs/Shadowhawk_12C.png"
exact "Shadow Hawk SHD-5D (Sandy)" "mechs/Shadowhawk_4H.png"
#IIC
-chassis "Shadow Hawk IIC" "mechs/Shadow Hawk IIC.png"
-exact "Shadow Hawk IIC 2" "mechs/Shadow Hawk IIC 2.png"
-exact "Shadow Hawk IIC 3" "mechs/Shadow Hawk IIC 3.png"
-exact "Shadow Hawk IIC 4" "mechs/Shadow Hawk IIC 4.png"
-exact "Shadow Hawk IIC 5" "mechs/Shadow Hawk IIC 5.png"
-exact "Shadow Hawk IIC 6" "mechs/Shadow Hawk IIC 6.png"
-exact "Shadow Hawk IIC 7" "mechs/Shadow Hawk IIC 7.png"
-exact "Shadow Hawk IIC 8" "mechs/Shadow Hawk IIC 8.png"
-exact "Shadow Hawk IIC 9" "mechs/Shadow Hawk IIC 9.png"
+chassis "Shadow Hawk IIC" "mechs/ShadowhawkIIC.png"
+exact "Shadow Hawk IIC 2" "mechs/ShadowhawkIIC_2.png"
+exact "Shadow Hawk IIC 3" "mechs/ShadowhawkIIC_3.png"
+exact "Shadow Hawk IIC 4" "mechs/ShadowhawkIIC_4.png"
+exact "Shadow Hawk IIC 5" "mechs/ShadowhawkIIC_5.png"
+exact "Shadow Hawk IIC 6" "mechs/ShadowhawkIIC_6.png"
+exact "Shadow Hawk IIC 7" "mechs/ShadowhawkIIC_7.png"
+exact "Shadow Hawk IIC 8" "mechs/ShadowhawkIIC_8.png"
+exact "Shadow Hawk IIC 9" "mechs/ShadowhawkIIC_9.png"
+exact "Shadow Hawk IIC 10" "mechs/ShadowhawkIIC_10.png"
#ShadowHawk LAM
chassis "Shadow Hawk LAM" "mechs/Shadow Hawk LAM Mech.png"
chassis "Shadow Hawk LAM_fighter" "mechs/Shadow Hawk LAM Fighter.png"
diff --git a/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf b/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf
index 8bbfa7bd56f..35596de6d1c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf
+++ b/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf
@@ -3,39 +3,39 @@ Longbow
LGB-0W
Config:Biped
-TechBase:Inner Sphere
-Era:2529
-Source:TRO 3039 - Age of War
-Rules Level:1
-
-Mass:85
-Engine:340 Fusion Engine
-Structure:Standard
-Myomer:Standard
-
-Heat Sinks:13 Single
-Walk MP:4
-Jump MP:0
-
-Armor:Standard(Inner Sphere)
-LA Armor:9
-RA Armor:9
-LT Armor:18
-RT Armor:18
-CT Armor:21
-HD Armor:9
-LL Armor:18
-RL Armor:18
-RTL Armor:7
-RTR Armor:7
-RTC Armor:10
+techbase:Inner Sphere
+era:2529
+source:TRO 3039 - Age of War
+rules level:1
+
+mass:85
+engine:340 Fusion Engine(IS)
+structure:IS Standard
+myomer:Standard
+
+heat sinks:13 Single
+walk mp:4
+jump mp:0
+
+armor:Standard(Inner Sphere)
+LA armor:9
+RA armor:9
+LT armor:18
+RT armor:18
+CT armor:21
+HD armor:9
+LL armor:18
+RL armor:18
+RTL armor:7
+RTR armor:7
+RTC armor:10
Weapons:5
-Small Laser, Head
LRM 20, Left Arm
LRM 20, Right Arm
LRM 5, Left Torso
LRM 5, Right Torso
+Small Laser, Head
Left Arm:
Shoulder
@@ -149,4 +149,17 @@ Foot Actuator
-Empty-
-Empty-
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:To add some speed to the Longbow, the OW variant removes two Medium Lasers and five and a half tons of armor. This allowed the Strand 255 Fusion Engine to be replaced with a larger Strand 340, increasing the top speed of the Longbow to 64 km/h, allowing the 'Mech to keep up with most heavy 'Mechs. The LGB-0W used the O/P 3000 COMSET communications system and the Octagon Tartrac System C targeting and tracking system.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 340
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf
index a136508abf7..51107fce4a6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf
@@ -3,51 +3,54 @@ Axman
AXM-4D
Config:Biped
-TechBase:Inner Sphere
-Era:3071
-Source:TRO 3050 - Jihad
-Rules Level:2
-
-Mass:65
-Engine:260 XL Engine
-Structure:Standard
-Myomer:Standard
-
-Heat Sinks:10 Single
-Walk MP:4
-Jump MP:0
-
-Armor:Ferro-Fibrous
-LA Armor:17
-RA Armor:17
-LT Armor:21
-RT Armor:21
-CT Armor:28
-HD Armor:9
-LL Armor:24
-RL Armor:24
-RTL Armor:6
-RTR Armor:6
-RTC Armor:6
-
-Weapons:3
-2 ISMediumLaser, Left Arm
-2 ISLAC5, Right Torso, Ammo:40
-2 ISLAC5, Left Torso
+techbase:Inner Sphere
+era:3071
+source:TRO 3050 - Jihad
+rules level:2
+
+mass:65
+engine:260 XL Engine(IS)
+structure:IS Standard
+myomer:Standard
+
+heat sinks:10 Single
+walk mp:4
+jump mp:0
+
+armor:Ferro-Fibrous(Inner Sphere)
+LA armor:17
+RA armor:17
+LT armor:21
+RT armor:21
+CT armor:28
+HD armor:9
+LL armor:24
+RL armor:24
+RTL armor:6
+RTR armor:6
+RTC armor:6
+
+Weapons:6
+Medium Laser, Left Arm
+Medium Laser, Left Arm
+Light AC/5, Left Torso
+Light AC/5, Left Torso
+Light AC/5, Right Torso
+Light AC/5, Right Torso
Left Arm:
Shoulder
Upper Arm Actuator
Lower Arm Actuator
Hand Actuator
+Medium Laser
+Medium Laser
ISTargeting Computer
ISTargeting Computer
ISTargeting Computer
ISTargeting Computer
ISTargeting Computer
ISTargeting Computer
-ISMediumLaser
-ISMediumLaser
Right Arm:
Shoulder
@@ -59,37 +62,37 @@ Hatchet
Hatchet
Hatchet
Hatchet
-Ferro-Fibrous
-Ferro-Fibrous
-Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
Left Torso:
Fusion Engine
Fusion Engine
Fusion Engine
-ISLAC5
-ISLAC5
-ISLAC5
-ISLAC5
+Light Auto Cannon/5
+Light Auto Cannon/5
+Light Auto Cannon/5
+Light Auto Cannon/5
+IS Ammo LAC/5
+IS Ammo LAC/5
ISCASE
-Ferro-Fibrous
-Ferro-Fibrous
-Ferro-Fibrous
-Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
Right Torso:
Fusion Engine
Fusion Engine
Fusion Engine
-ISLAC5
-ISLAC5
-ISLAC5
-ISLAC5
-ISLAC5 Ammo
-ISLAC5 Ammo
-Ferro-Fibrous
-Ferro-Fibrous
-Ferro-Fibrous
+Light Auto Cannon/5
+Light Auto Cannon/5
+Light Auto Cannon/5
+Light Auto Cannon/5
+IS Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
Center Torso:
Fusion Engine
@@ -124,8 +127,8 @@ Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
-Ferro-Fibrous
-Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
-Empty-
-Empty-
-Empty-
@@ -138,8 +141,8 @@ Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
-Ferro-Fibrous
-Ferro-Fibrous
+IS Ferro-Fibrous
+IS Ferro-Fibrous
-Empty-
-Empty-
-Empty-
@@ -147,12 +150,9 @@ Ferro-Fibrous
-Empty-
-Empty-
-Overview: If any one 'Mech was representative of the Federated Commonwealth alliance, it was the Axman. Constructed and supplied by parts from throughout the Commonwealth, some would call the Axman a result of "Steiner inspiration and Davion perspiration". Little more than an overgrown Hatchetman, the Axman would repeat the same general philosophy of the lighter 'Mech on a heavier, sturdier, and overall more dangerous chassis. The fact that it used a wide variety of cutting-edge (for the time) technologies for its construction proved the faith both nations had in the new interstellar alliance.
-
-Capabilities: A consumate brawler, the Axman is unsurprisingly build towards using its titanium-sheathed hatchet. Jump jets and a large secondary array of laser weapons give it a similar combat profile to the older Thunderbolt -5SE, though the massive AC/20 mounted in the right torso give the Axman a frightening punch even outside of melee combat. The all was only permitted by falling back on a Magna 260 XL engine. While the engine was without flaws, more than a few MechWarriors found the use of such a fragile engine to be suboptimal on a physically-oriented design.
-
-Deployment: The Axman saw wide usage within the Federated Commonwealth and its closest allies. Though the sundering of the alliance would nearly kill the design, both manufacturing hubs on New Syrtis and Furillo would adapt to keep the design in production. The -4D would be the Davion-flavored take on the design. A switch to four light autocannons instead of the single AC/20 and pulse laser would increase design, while the four tons of ammo allowed for the deployment of newly-developed specialty rounds. A targeting computer would further increase accuracy. These changes necessitated the sacrifice of the jump jets, though the cost-cutting decision to use single heat sinks would prove to be the least popular change.
-
+overview:If any one 'Mech was representative of the Federated Commonwealth alliance, it was the Axman. Constructed and supplied by parts from throughout the Commonwealth, some would call the Axman a result of "Steiner inspiration and Davion perspiration". Little more than an overgrown Hatchetman, the Axman would repeat the same general philosophy of the lighter 'Mech on a heavier, sturdier, and overall more dangerous chassis. The fact that it used a wide variety of cutting-edge (for the time) technologies for its construction proved the faith both nations had in the new interstellar alliance.
+capabilities:A consumate brawler, the Axman is unsurprisingly build towards using its titanium-sheathed hatchet. Jump jets and a large secondary array of laser weapons give it a similar combat profile to the older Thunderbolt -5SE, though the massive AC/20 mounted in the right torso give the Axman a frightening punch even outside of melee combat. The all was only permitted by falling back on a Magna 260 XL engine. While the engine was without flaws, more than a few MechWarriors found the use of such a fragile engine to be suboptimal on a physically-oriented design.
+deployment: The Axman saw wide usage within the Federated Commonwealth and its closest allies. Though the sundering of the alliance would nearly kill the design, both manufacturing hubs on New Syrtis and Furillo would adapt to keep the design in production. The -4D would be the Davion-flavored take on the design. A switch to four light autocannons instead of the single AC/20 and pulse laser would increase design, while the four tons of ammo allowed for the deployment of newly-developed specialty rounds. A targeting computer would further increase accuracy. These changes necessitated the sacrifice of the jump jets, though the cost-cutting decision to use single heat sinks would prove to be the least popular change.
systemmanufacturer:CHASSIS:Dorwinion
systemmode:CHASSIS:AXM Standard
systemmanufacturer:ENGINE:Magna
@@ -163,3 +163,4 @@ systemmanufacturer:COMMUNICATIONS:Johnston
systemmode:COMMUNICATIONS:Wide Band
systemmanufacturer:TARGETING:Rander
systemmode:TARGETING:Pinpoint-HY
+
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf
index 6577d0898a6..ecca5b951a3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf
@@ -150,15 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:Configured for a more all around combat role, the Warhawk A had two ER Large Lasers for long range combat. These were supported by an LB 10-X Autocannon that could fire both solid and cluster ammunition and an LRM-15 launcher capable of providing long range missile fire support. For close combat, the 'Mech mounted a highly accurate Streak SRM-6 launcher.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:Configured for a more all around combat role, the Warhawk A had two ER Large Lasers for long range combat. These were supported by an LB 10-X Autocannon that could fire both solid and cluster ammunition and an LRM-15 launcher capable of providing long range missile fire support. For close combat, the 'Mech mounted a highly accurate Streak SRM-6 launcher.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf
index dfa2f7068f9..67f8c37f68f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf
@@ -153,15 +153,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:The B configuration of the Warhawk was a generalist rather than focused variant. For long range combat, the 'Mech carried a Gauss Rifle which could do a great deal of damage at long range. For close combat, the 'Mech had three ER Medium Lasers and a single ER Small Laser as well as two SRM-6 launchers. Finally, the 'Mech also carried a Narc Missile Beacon launcher which was capable of tagging a 'Mech with a beacon that can be used by friendly units for more accurate missile fire on the designated target.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:The B configuration of the Warhawk was a generalist rather than focused variant. For long range combat, the 'Mech carried a Gauss Rifle which could do a great deal of damage at long range. For close combat, the 'Mech had three ER Medium Lasers and a single ER Small Laser as well as two SRM-6 launchers. Finally, the 'Mech also carried a Narc Missile Beacon launcher which was capable of tagging a 'Mech with a beacon that can be used by friendly units for more accurate missile fire on the designated target.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf
index af05fd3102f..319e62d7cae 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf
@@ -150,15 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:The C configuration was a sort of compromise on the Primary configuration of the Warhawk. The 'Mech carried two ER PPCs for deadly accurate long range fire, supported at close range by a pair of powerful and already highly accurate Large Pulse Lasers, the lethality of all four weapons only increased by the Targeting Computer. The 'Mech carried a Flamer as well for use against infantry and mounted three additional double heat sinks to handle the 'Mech's heat load.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:The C configuration was a sort of compromise on the Primary configuration of the Warhawk. The 'Mech carried two ER PPCs for deadly accurate long range fire, supported at close range by a pair of powerful and already highly accurate Large Pulse Lasers, the lethality of all four weapons only increased by the Targeting Computer. The 'Mech carried a Flamer as well for use against infantry and mounted three additional double heat sinks to handle the 'Mech's heat load.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf
index 63430fead97..aa297102594 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf
@@ -150,17 +150,19 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:A 'Mech that could handle itself well at long range, the Warhawk D carried as its primary long range weapons a pair of ER Large Lasers which were supported by an Ultra Autocannon/10 that could fire at twice the rate as a standard autocannon. For short range the 'Mech had a single ER Small Laser and, as a sort of wild card, carried an ATM-9 launcher which could fire ammunition for long, medium, and short ranges which carry larger warhead payloads as the 'Mech closed on its target.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:A 'Mech that could handle itself well at long range, the Warhawk D carried as its primary long range weapons a pair of ER Large Lasers which were supported by an Ultra Autocannon/10 that could fire at twice the rate as a standard autocannon. For short range the 'Mech had a single ER Small Laser and, as a sort of wild card, carried an ATM-9 launcher which could fire ammunition for long, medium, and short ranges which carry larger warhead payloads as the 'Mech closed on its target.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
systemmanufacturer:COMMUNICATIONS:Series 10 CBS MultiFreq
+systemmanufacturer:TARGETING:HawkEye J360 CBS MultiFreq
systemmanufacturer:TARGETING:HawkEye J360
\ No newline at end of file
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf
index 0bdcfb6f2e4..1bee8bf4f59 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf
@@ -152,15 +152,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:A sort of fusion between the B and C variants, the Warhawk E mounted an ER PPC, a Large Pulse Laser, and an SRM-6. The new addition to the design was three Plasma Cannons. The Targeting Computer made the energy weapons more accurate.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:A sort of fusion between the B and C variants, the Warhawk E mounted an ER PPC, a Large Pulse Laser, and an SRM-6. The new addition to the design was three Plasma Cannons. The Targeting Computer made the energy weapons more accurate.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf
index b123b9be9ff..8b17551c34d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf
@@ -150,15 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
-capabilities:A close combat configuration of the Warhawk, the H configuration carried as its only true long range weapon an LRM-10 launcher. This was backed up by a pair of Large Pulse Lasers and also a pair of Heavy Large Lasers which gave the 'Mech incredible close range damage potential. To handle the heavy heat load, the Warhawk H carried an additional five double heat sinks.
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+deployment:A close combat configuration of the Warhawk, the H configuration carried as its only true long range weapon an LRM-10 launcher. This was backed up by a pair of Large Pulse Lasers and also a pair of Heavy Large Lasers which gave the 'Mech incredible close range damage potential. To handle the heavy heat load, the Warhawk H carried an additional five double heat sinks.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
+
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf
index defd0bea278..4ef7a87423b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf
@@ -4,9 +4,9 @@ Prime
Config:Biped Omnimech
techbase:Clan
-era:2999
+era:3112
source:TRO 3050 - Succession Wars
-rules level:2
+rules level:3
mass:85
engine:340 XL (Clan) Engine(IS)
@@ -34,37 +34,37 @@ RTC armor:10
Weapons:5
ER PPC, Left Arm
ER PPC, Left Arm
-LRM 10, Left Arm
-ER PPC, Right Arm
-ER PPC, Right Arm
+ER Flamer, Left Arm
+ER Flamer, Left Arm
+ATM 12, Right Arm
Left Arm:
Shoulder
Upper Arm Actuator
CLERPPC (OMNIPOD)
CLERPPC (OMNIPOD)
+PPC Capacitor (OMNIPOD)
CLERPPC (OMNIPOD)
CLERPPC (OMNIPOD)
-CLLRM10 (OMNIPOD)
-Clan Ammo LRM-10 (OMNIPOD)
+PPC Capacitor (OMNIPOD)
+CLERFlamer (OMNIPOD)
+CLERFlamer (OMNIPOD)
Clan Ferro-Fibrous
-Empty-
--Empty-
--Empty-
Right Arm:
Shoulder
Upper Arm Actuator
-CLERPPC (OMNIPOD)
-CLERPPC (OMNIPOD)
-CLERPPC (OMNIPOD)
-CLERPPC (OMNIPOD)
+CLATM12 (OMNIPOD)
+CLATM12 (OMNIPOD)
+CLATM12 (OMNIPOD)
+CLATM12 (OMNIPOD)
+CLATM12 (OMNIPOD)
+Clan Ammo ATM-12 (OMNIPOD)
+Clan Ammo ATM-12 ER (OMNIPOD)
+Clan Ammo ATM-12 HE (OMNIPOD)
+CLCASEII (OMNIPOD)
Clan Ferro-Fibrous
--Empty-
--Empty-
--Empty-
--Empty-
--Empty-
Left Torso:
Fusion Engine
@@ -88,8 +88,8 @@ CLDoubleHeatSink
CLTargeting Computer (OMNIPOD)
CLTargeting Computer (OMNIPOD)
CLTargeting Computer (OMNIPOD)
-CLTargeting Computer (OMNIPOD)
-CLTargeting Computer (OMNIPOD)
+WatchdogECMSuite (OMNIPOD)
+WatchdogECMSuite (OMNIPOD)
Clan Ferro-Fibrous
Clan Ferro-Fibrous
-Empty-
@@ -105,7 +105,7 @@ Gyro
Fusion Engine
Fusion Engine
Fusion Engine
--Empty-
+Supercharger (Clan) (OMNIPOD)
-Empty-
Head:
@@ -150,13 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect. The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
-capabilities:In its primary configuration, the Warhawk had an impressive arsenal of long range weapons which were centered around four ER PPCs that took advantage of the 'Mech’s Targeting Computer. While unable to fire all of the ER PPCs at once it could use a volley fire strategy to manage its heat. These were backed up by an LRM-10 launcher that allowed the Warhawk a secondary weapon that can be utilized for long range combat.
-deployment:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it.
+overview:Introduced by Clan Smoke Jaguar in 2999 in preparation for the anticipated return to the Inner Sphere, while the Dragoon Compromise stalled such plans, the Jaguars unleashed the powerful Warhawk on their Warden opponents to deadly effect.
+
+capabilities:The Warhawk was powered by a massive 340 XL Engine that gave it a top speed of 64.8 km/h and mounted thirteen and a half tons of Ferro-Fibrous armor to protect itself from enemy fire. To dissipate the massive waste heat produced in its various configurations, it carried a staggering twenty double heat sinks. Additionally, though not truly fixed equipment on the chassis, the Warhawk managed to incorporate an advanced Targeting Computer into each of its configurations, making all of its direct fire weapons extremely accurate.
+
+deployment:In its primary configuration, the Warhawk had an impressive arsenal of long range weapons which were centered around four ER PPCs that took advantage of the 'Mech’s Targeting Computer. While unable to fire all of the ER PPCs at once it could use a volley fire strategy to manage its heat. These were backed up by an LRM-10 launcher that allowed the Warhawk a secondary weapon that can be utilized for long range combat.
+
+history:Deployed extensively in the Jaguar frontline forces, and often seen paired with the Dire Wolf, the design truly came to prominence as originally intended, on the battlefields of the Jaguars' Invasion Corridor and earned the code name of Masakari - a Japanese battle-axe used on medieval Terra - from warriors within the DCMS who faced it. Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-Though it appeared in the Toumans of a number of other Clans, such as the Ghost Bears and Jade Falcons, the Jaguars jealously guarded their production, and all examples of the highly prized 'Mech outside of the Jaguars were battlefield salvage until production lines and design specs finally spread to the Fire Mandrills, Diamond Sharks and Goliath Scorpions upon the Smoke Jaguars' Annihilation. Produced exclusively on the Clan Homeworlds, the design was one of many lost to the Inner Sphere Clans after contact with the Homeworlds ceased during the Jihad.
-manufacturer:Phan Industrialplex, Abysmal Manufacturing Complex, Kindraa Kline Primary Production Facility
-primaryfactory:Huntress, Huntress, Dagda
+manufacturer:Phan Industrialplex,Abysmal Manufacturing Complex,Kindraa Kline Primary Production Facility,Imperial BattleMechs
+primaryfactory:Huntress,Huntress,Dagda,Antwerp
systemmanufacturer:CHASSIS:Huntress WH
systemmanufacturer:ENGINE:General Systems 340 XL
systemmanufacturer:ARMOR:Forging X85 Ferro-Fibrous
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf
index 144b27e1588..17c33b84d74 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf
@@ -150,4 +150,16 @@ Heat Sink
-Empty-
-Empty-
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:The primary weapons on the Longbow are its LRM launchers. The Longbow carries four launchers in all. The largest are a pair of Holly LRM-20s which have the firepower of two Delta Dart LRM-5s added to them. Combined, the launchers can put a devastating barrage of up to fifty missiles at ranges of six hundred and thirty meters. To protect itself in close combat, the Longbow has two Ceres Arms Medium Lasers.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf
index d5f74d04f36..9de44b056f9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf
@@ -152,4 +152,16 @@ Foot Actuator
-Empty-
-Empty-
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:The 7V variant of the Longbow upgrades the design to more modern specifications. The 'Mech is powered by an XL engine that weighs half as much as the original engine. The 'Mech also removes the two LRM-5 launchers and adds Artemis IV to the LRM-20 launchers, and CASE for added protection. For close combat, the 7V has 5 Medium Pulse Lasers. To add a little more long range firepower, the 7V has also has an ER Large Laser.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255 XL
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion A.mtf b/megamek/data/mechfiles/mechs/3067/Hellion A.mtf
index 48033f57029..21f52764fbf 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion A.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Hellion A.mtf
@@ -149,4 +149,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
+overview:The Hellion is a product of Clan Ice Hellion and their philosophy that espouses speed above all else. Based on the Mist Lynx, the Hellion is a fast OmniMech that has respectable firepower.
+
+capabilities:This light 'Mech is rather difficult to kill, incorporating five and a half tons of Ferro-Fibrous armor. To save weight, the Hellion also uses an Endo Steel chassis. While it is not especially fast for its size, the Hellion does use MASC to allow for bursts of additional speed.
+deployment:A mobile harassment configuration, the Hellion A has a trio of LRM-10 launchers, allowing it to harass an enemy from long range. For close combat, the 'Mech has a single ER Medium Laser.
+
+manufacturer:Hector MechWorks Facility Alpha,Prosoma War Works,Svarstaad Industriplex Alpha
+primaryfactory:Hector,Valencia,Svarstaad
+systemmanufacturer:CHASSIS:Hellion Light Endo Steel V5
+systemmanufacturer:ENGINE:210 XL
+systemmanufacturer:ARMOR:Compound Gamma Ferro-Fibrous
+systemmanufacturer:COMMUNICATIONS:HCFA 3035 3.0
+systemmanufacturer:TARGETING:HCFA 3047 1.5
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion B.mtf b/megamek/data/mechfiles/mechs/3067/Hellion B.mtf
index ee0679e402a..4dd4913aa5a 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion B.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Hellion B.mtf
@@ -151,4 +151,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
+overview:The Hellion is a product of Clan Ice Hellion and their philosophy that espouses speed above all else. Based on the Mist Lynx, the Hellion is a fast OmniMech that has respectable firepower.
+
+capabilities:This light 'Mech is rather difficult to kill, incorporating five and a half tons of Ferro-Fibrous armor. To save weight, the Hellion also uses an Endo Steel chassis. While it is not especially fast for its size, the Hellion does use MASC to allow for bursts of additional speed.
+deployment:A dangerous heavy laser configuration, the Hellion B has a Heavy Large Laser, four Heavy Medium Lasers, and a Heavy Small Laser. Added to all this laser power are three additional double heat sinks. Even with the extra heat sinks, the Hellion B will not last long firing all of its weapons.
+
+manufacturer:Hector MechWorks Facility Alpha,Prosoma War Works,Svarstaad Industriplex Alpha
+primaryfactory:Hector,Valencia,Svarstaad
+systemmanufacturer:CHASSIS:Hellion Light Endo Steel V5
+systemmanufacturer:ENGINE:210 XL
+systemmanufacturer:ARMOR:Compound Gamma Ferro-Fibrous
+systemmanufacturer:COMMUNICATIONS:HCFA 3035 3.0
+systemmanufacturer:TARGETING:HCFA 3047 1.5
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion C.mtf b/megamek/data/mechfiles/mechs/3067/Hellion C.mtf
index 079534ff3d6..fbb1c5e95b3 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion C.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Hellion C.mtf
@@ -150,4 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
+overview:The Hellion is a product of Clan Ice Hellion and their philosophy that espouses speed above all else. Based on the Mist Lynx, the Hellion is a fast OmniMech that has respectable firepower.
+
+capabilities:This light 'Mech is rather difficult to kill, incorporating five and a half tons of Ferro-Fibrous armor. To save weight, the Hellion also uses an Endo Steel chassis. While it is not especially fast for its size, the Hellion does use MASC to allow for bursts of additional speed.
+deployment:A heat efficient headhunter configuration, the Hellion C has an ATM 6 launcher, as well as four ER Medium Lasers that are integrated into a Targeting Computer for increased accuracy.
+
+manufacturer:Hector MechWorks Facility Alpha,Prosoma War Works,Svarstaad Industriplex Alpha
+primaryfactory:Hector,Valencia,Svarstaad
+systemmanufacturer:CHASSIS:Hellion Light Endo Steel V5
+systemmanufacturer:ENGINE:210 XL
+systemmanufacturer:ARMOR:Compound Gamma Ferro-Fibrous
+systemmanufacturer:COMMUNICATIONS:HCFA 3035 3.0
+systemmanufacturer:TARGETING:HCFA 3047 1.5
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf b/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf
index 8647353acf4..fcb6caa8643 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf
@@ -3,33 +3,33 @@ Hellion
Prime
Config:Biped Omnimech
-TechBase:Clan
-Era:3059
-Source:TRO 3067
-Rules Level:2
-
-Mass:30
-Engine:210 XL (Clan) Engine(IS)
-Structure:Clan Endo Steel
-Myomer:Standard
-
-Heat Sinks:10 Double
-Base Chassis Heat Sinks:8
-Walk MP:7
-Jump MP:0
-
-Armor:Ferro-Fibrous(Clan)
-LA Armor:10
-RA Armor:10
-LT Armor:10
-RT Armor:10
-CT Armor:15
-HD Armor:9
-LL Armor:14
-RL Armor:14
-RTL Armor:4
-RTR Armor:4
-RTC Armor:5
+techbase:Clan
+era:3059
+source:TRO 3067
+rules level:2
+
+mass:30
+engine:210 XL (Clan) Engine(IS)
+structure:Clan Endo Steel
+myomer:Standard
+
+heat sinks:10 Clan Double
+base chassis heat sinks:8
+walk mp:7
+jump mp:0
+
+armor:Ferro-Fibrous(Clan)
+LA armor:10
+RA armor:10
+LT armor:10
+RT armor:10
+CT armor:15
+HD armor:9
+LL armor:14
+RL armor:14
+RTL armor:4
+RTR armor:4
+RTC armor:5
Weapons:8
ER Medium Laser, Left Arm
@@ -46,7 +46,7 @@ Shoulder
Upper Arm Actuator
Lower Arm Actuator
Hand Actuator
-CLERMediumLaser (omnipod)
+CLERMediumLaser (OMNIPOD)
Clan Ferro-Fibrous
Clan Ferro-Fibrous
Clan Ferro-Fibrous
@@ -58,8 +58,8 @@ Clan Ferro-Fibrous
Right Arm:
Shoulder
Upper Arm Actuator
-CLERMediumLaser (omnipod)
-CLERMediumLaser (omnipod)
+CLERMediumLaser (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
Clan Ferro-Fibrous
Clan Ferro-Fibrous
Clan Endo Steel
@@ -72,9 +72,9 @@ Clan Endo Steel
Left Torso:
Fusion Engine
Fusion Engine
-CLStreakSRM2 (omnipod)
-CLStreakSRM2 (omnipod)
-Clan Streak SRM 2 Ammo (omnipod)
+CLStreakSRM2 (OMNIPOD)
+CLStreakSRM2 (OMNIPOD)
+Clan Streak SRM 2 Ammo (OMNIPOD)
Clan Endo Steel
Clan Endo Steel
Clan Endo Steel
@@ -87,9 +87,9 @@ Right Torso:
Fusion Engine
Fusion Engine
CLMASC
-CLLRM10 (omnipod)
-CLStreakSRM2 (omnipod)
-Clan Ammo LRM-10 (omnipod)
+CLLRM10 (OMNIPOD)
+CLStreakSRM2 (OMNIPOD)
+Clan Ammo LRM-10 (OMNIPOD)
Clan Endo Steel
Clan Endo Steel
-Empty-
@@ -115,7 +115,7 @@ Head:
Life Support
Sensors
Cockpit
-CLERMediumLaser (omnipod)
+CLERMediumLaser (OMNIPOD)
Sensors
Life Support
-Empty-
@@ -153,4 +153,18 @@ CLDoubleHeatSink
-Empty-
-Empty-
+overview:The Hellion is a product of Clan Ice Hellion and their philosophy that espouses speed above all else. Based on the Mist Lynx, the Hellion is a fast OmniMech that has respectable firepower.
+
+capabilities:This light 'Mech is rather difficult to kill, incorporating five and a half tons of Ferro-Fibrous armor. To save weight, the Hellion also uses an Endo Steel chassis. While it is not especially fast for its size, the Hellion does use MASC to allow for bursts of additional speed.
+
+deployment:The Hellion sports no fixed weapons on its chassis. The primary configuration consists of four ER Medium Lasers as well as a trio of Streak SRM-2s, which make it a potent headhunter 'Mech. It also packs an LRM-10 to harass enemies at range.
+
+manufacturer:Hector MechWorks Facility Alpha,Prosoma War Works,Svarstaad Industriplex Alpha
+primaryfactory:Hector,Valencia,Svarstaad
+systemmanufacturer:CHASSIS:Hellion Light Endo Steel V5
+systemmanufacturer:ENGINE:210 XL
+systemmanufacturer:ARMOR:Compound Gamma Ferro-Fibrous
+systemmanufacturer:COMMUNICATIONS:HCFA 3035 3.0
+systemmanufacturer:TARGETING:HCFA 3047 1.5
+
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf
index 6a7b8b30c98..cccbdfdb3a6 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf
@@ -149,4 +149,16 @@ ISArrowIVHomingAmmo
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\longbow LGB-7Q.jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This variant was introduced during the Jihad. By removing three of the 7V's Medium Pulse Lasers, designers were able to install two Arrow IV launchers with 10 rounds of ammunition per launcher. This variant retains two of the MPLs plus the ER Large Laser for direct fire and defense.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255 XL
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
\ No newline at end of file
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf
index bc983a9ea37..85c4751f639 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf
@@ -151,4 +151,16 @@ Foot Actuator
-Empty-
-Empty-
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:A recent upgrade of the Longbow, the 12C variant is designed to maximize the 'Mech's fire support capabilities. The 'Mech has two LRM-20 launchers and two LRM-15 launchers, giving it an incredible bombardment capability and is capable of firing 40% more missiles down range than the base model. The 'Mech has three ER Small Lasers for close combat. The 12C variant is capable of doing this through the use of an XL engine that saves a great deal of weight.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255 XL
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf
index 28b6ea74b40..6c197bafb95 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf
@@ -3,32 +3,32 @@ Longbow
LGB-12R
Config:Biped
-TechBase:Inner Sphere
-Era:3082
-Source:Dark Age
-Rules Level:2
-
-Mass:85
-Engine:255 Light Engine(IS)
-Structure:Standard
-Myomer:Standard
-
-Heat Sinks:11 Double
-Walk MP:3
-Jump MP:3
-
-Armor:Standard(Inner Sphere)
-LA Armor:22
-RA Armor:22
-LT Armor:25
-RT Armor:25
-CT Armor:35
-HD Armor:9
-LL Armor:26
-RL Armor:26
-RTL Armor:8
-RTR Armor:8
-RTC Armor:10
+techbase:Inner Sphere
+era:3082
+source:Dark Age
+rules level:2
+
+mass:85
+engine:255 Light Engine(IS)
+structure:IS Standard
+myomer:Standard
+
+heat sinks:11 IS Double
+walk mp:3
+jump mp:3
+
+armor:Standard(Inner Sphere)
+LA armor:22
+RA armor:22
+LT armor:25
+RT armor:25
+CT armor:35
+HD armor:9
+LL armor:26
+RL armor:26
+RTL armor:8
+RTR armor:8
+RTC armor:10
Weapons:6
LRM 15, Left Arm
@@ -150,4 +150,18 @@ Jump Jet
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\3085 Longbow .jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This version of the Longbow carries a quartet of LRM-15 launchers, backed up by an ER Large Laser and ER Medium Laser. CASE protects the ammunition bins, while three jump jets allow the 12R to cover 90 meters at a time. To make room for this equipment, a Light Fusion Engine is used.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255 Light
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:JUMPJET:Unknown
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
+
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf
index aa2d360c2a5..d9d9ce30a0b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf
@@ -153,4 +153,16 @@ Foot Actuator
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\3085 Longbow .jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This upgrade of the 12C mounts six Doombud MML 7s, each of which is tied to an Artemis IV FCS. Six tons of CASE-protected ammunition supply these launchers. Three Diverse Optics ER Small Lasers provide paltry backup, though massed short-range missiles coming from the Multi-Missile Launchers are sure to deter smaller 'Mechs. A larger engine brings the 13C to a speed that matches that of the OW.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 340 XL
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf
index 6ffd481f7c8..e0ffce6a281 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf
@@ -155,4 +155,16 @@ ISBPod
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\3085 Longbow .jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This variant removes all missile launchers from the Longbow and uses a standard Fusion Engine, though it does use an Endo Steel frame to save weight. Each arm mounts three Light Autocannon/5s that can make use of special munitions produced by the Federated Suns. To ensure that it can mount such ammunition, seven tons are allotted to the ammunition bins. A Guardian ECM Suite protects it from enemy electronics, while a C3 Slave uses targeting data from other C3 equipped units to improve its accuracy. The 13NAIS mounts on ER Small Laser and a pair of ER Medium Lasers, along with a pair of B-Pods for use against battle armor.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf
index 66fec39cb1b..4c0eb1ea4fc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf
@@ -153,4 +153,16 @@ IS Ammo MML-9 SRM
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\3085 Longbow .jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This upgrade of the 12C uses six Doombud MML 9s with ten tons of ammunition supplying them. For backup, it uses three ER Medium Lasers. It also mounts an additional ton and a half of armor, though it has two fewer double heat sinks. Pilots are cramped into a Small Cockpit, but seem to accept the additional firepower.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255 XL
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf
index 659ef45ca52..3a613ef8644 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf
@@ -150,4 +150,17 @@ Ferro-Fibrous
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:A newer variant that dates to the late 3050s, the IIC 3's main gun is a Heavy Large Laser. It is supplemented by a Medium Pulse Laser. For use against infantry, the 'Mech carries paired ER Micro Lasers and Micro Pulse Lasers. Four additional double heat sinks keep down the heat generated by the all-laser complement.
+
+manufacturer:Barcella Alpha,Irece Alpha
+primaryfactory:Barcella,Irece
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf
index b2e3a1b95db..1a3a9c2f5c4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf
@@ -148,4 +148,17 @@ Ferro-Fibrous
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:First fielded in 3060, the IIC 4 was a joint effort by Clan Nova Cat and Clan Diamond Shark to upgrade their second-line forces. The result was a 'Mech that is visually very different from the design it is considered a variant of. This 'Mech carries a Type 6 Series ATM System with three tons of ammunition to allow for flexibility of choice. The missile launcher is backed up by two Series 14NC Medium Pulse Lasers and a Series 2NC ER Medium Laser.
+
+manufacturer:Barcella Alpha,Irece Alpha
+primaryfactory:Barcella,Irece
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf
index 9d0c0e61e94..fd07386e636 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf
@@ -149,4 +149,17 @@ Ferro-Fibrous
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:This variant uses twin Zeta-Series X Plasma Cannons and a trio of Tau-II AP Gauss Rifles to decimate non-BattleMech formations.
+
+manufacturer:Trellshire Heavy Industries (Refit)
+primaryfactory:Twycross
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf
index 3648a4a944a..85c33b95f72 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf
@@ -149,4 +149,17 @@ Jump Jet
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:This version uses an XL Engine to make room for a HAG 20 and three tons of ammunition. To back it up, the IIC 6 mounts two Medium Pulse Lasers, an ER Small Laser, and a Small Pulse Laser.
+
+manufacturer:Manufacturing Site #3 (Refit),Transitional Facility HH-Beta (Refit)
+primaryfactory:New Oslo,Nouveaux Paris
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf
index f8434fb6ef4..ade1c5ad0bc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf
@@ -148,4 +148,17 @@ Clan Improved Jump Jet
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:This Clan Snow Raven variant is used in space combat to support or repel boarding attacks. By carrying eight Improved Jump Jets tied into extended capacity fuel tanks, the Shadow Hawk IIC 7 can maneuver in space very easily. On the ground the smaller XL Engine used reduces the top speed slightly, but the jump jets easily compensate for this. To reduce handling problems in space the weapons array consists of low-recoil ER Large and Medium lasers with a Medium Pulse Laser. In fact the only recoil-inducing weapon is the ATM-6 in the right torso. Three tons of ammunition space allow the IIC 7 pilot to tailor the weapon load depending on the situation.
+
+manufacturer:Eden Rose [Potemkin Class]/Facility 12-D,Snow Raven Industrial Complex Alpha
+primaryfactory:Dante,Dante
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf
index 2c512bac78c..119f9152523 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf
@@ -150,4 +150,17 @@ Clan Improved Jump Jet
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:This variant increases the maximum speed of the 'Mech to 96 km/h. Nine Improved Jump Jets allow it to cover 270 meters in a single bound. A head mounted ECM Suite disrupts enemy electronic systems. An ER Large Laser and LRM-10 provide long range firepower, and close combat is possible via the Heavy Medium Laser and Micro Pulse Laser mounted in each arm. This variant carries slightly less armor on the limbs and center torso.
+
+manufacturer:Trellshire Heavy Industries
+primaryfactory:Twycross
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf
index 6e1d7c81211..a918d01e5f3 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf
@@ -3,41 +3,41 @@ Atlas III
AS7-D3
Config:Biped
-TechBase:Mixed (IS Chassis)
-Era:3137
-Source:TRO 3145 Federated Suns - Dark Ages
-Rules Level:4
-
-Mass:100
-Engine:300 Fusion Engine(IS)
-Structure:IS Endo Steel
-Myomer:Standard
-
-Heat Sinks:12 Double
-Walk MP:3
-Jump MP:0
-
-Armor:Standard(IS/Clan)
-LA Armor:34
-RA Armor:34
-LT Armor:32
-RT Armor:32
-CT Armor:50
-HD Armor:9
-LL Armor:42
-RL Armor:42
-RTL Armor:10
-RTR Armor:10
-RTC Armor:12
+techbase:Mixed (IS Chassis)
+era:3137
+source:TRO 3145 Federated Suns - Dark Ages
+rules level:4
+
+mass:100
+engine:300 Fusion Engine(IS)
+structure:IS Endo Steel
+myomer:Standard
+
+heat sinks:12 IS Double
+walk mp:3
+jump mp:0
+
+armor:Standard(Clan)
+LA armor:34
+RA armor:34
+LT armor:32
+RT armor:32
+CT armor:50
+HD armor:9
+LL armor:42
+RL armor:42
+RTL armor:10
+RTR armor:10
+RTC armor:12
Weapons:7
-Rotary AC/2, Right Arm
-Streak LRM 20, Right Torso
-Medium X-Pulse Laser, Left Torso
Medium X-Pulse Laser, Left Arm
Medium X-Pulse Laser, Left Arm
-Medium X-Pulse Laser, Left Torso
+Rotary AC/2, Right Arm
Streak SRM 6, Left Torso
+Medium X-Pulse Laser, Left Torso
+Medium X-Pulse Laser, Left Torso
+Streak LRM 20, Right Torso
Left Arm:
Shoulder
@@ -72,7 +72,7 @@ ISStreakSRM6
ISStreakSRM6
ISMediumXPulseLaser
ISMediumXPulseLaser
-IS Streak SRM 6 Ammo
+IS Streak SRM 6 Ammo
Radical Heat Sink System
Radical Heat Sink System
Radical Heat Sink System
@@ -112,7 +112,7 @@ ISAngelECMSuite
Head:
Life Support
Sensors
-Cockpit (armored)
+Cockpit (ARMORED)
IS Endo Steel
Sensors
Life Support
@@ -152,13 +152,9 @@ IS Endo Steel
-Empty-
overview:A Dark Age-era evolution of the original Atlas, featuring a mix between advanced Clan and Inner Sphere technologies. The Atlas III is usually used as a Command 'Mech among the ranks of the AFFS and the Republic of the Sphere Armed Forces.
-
capabilities:The D3's construction reflects its intended role as (almost) a custom design for Commanders. The 'Mech is designed for dealing punishing attacks, while retaining the survivability and speed of the original Atlas. Engineers used 19.5 ton of Standard Armor fitted to an Endo Steel skeleton, and for the MechWarrior's protection the Atlas III employs an Armored Cockpit and a pair of Small Shields, with the latter split between both arms.
-
deployment:The D3's construction reflects its intended role as (almost) a custom design for Commanders. The 'Mech is designed for dealing punishing attacks, while retaining the survivability and speed of the original Atlas. Engineers used 19.5 ton of Standard Armor fitted to an Endo Steel skeleton, and for the MechWarrior's protection the Atlas III employs an Armored Cockpit and a pair of Small Shields, with the latter split between both arms. An advanced Angel ECM Suite has also been installed, giving the 'Mech greater capability to manage electronic warfare threats. Powering the Atlas III is the tried-and-true 300-rated Vlar Fusion Engine, which provides modest speeds and adequate protection on the battlefield. Along with the 'Mech's 12 Double Heat Sinks, a Radical Heat Sink System has been fitted in order to help manage the 'Mech's heat.
-
history:The AS7-D versions of this generation of the Atlas was constructed with a mixture of Advanced Clan and Inner Sphere technologies. When it was first produced, the D3 was rare among the ranks of the AFFS and its ally, the Republic of the Sphere, where it was used by Battalion and Regimental leaders as a Command 'Mech. It is unclear if the D3 model of the 'Mech remained in production after the Draconis Combine's capture of Robinson in 3144.
-
manufacturer:General Motors,Robinson Standard BattleWorks
primaryfactory:El Dorado,Robinson
systemmanufacturer:CHASSIS:Foundation 12X Endo Steel
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Hellion G.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Hellion G.mtf
index 6892921255e..2b4ef7db944 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Hellion G.mtf
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Hellion G.mtf
@@ -150,4 +150,16 @@ CLDoubleHeatSink
-Empty-
-Empty-
+overview:The Hellion is a product of Clan Ice Hellion and their philosophy that espouses speed above all else. Based on the Mist Lynx, the Hellion is a fast OmniMech that has respectable firepower.
+
+capabilities:This light 'Mech is rather difficult to kill, incorporating five and a half tons of Ferro-Fibrous armor. To save weight, the Hellion also uses an Endo Steel chassis. While it is not especially fast for its size, the Hellion does use MASC to allow for bursts of additional speed.
+deployment:This version carries an LRM-10 and three Improved Heavy Medium Lasers. It also packs an Inner Sphere-built TSEMP One Shot cannon in the left torso.
+
+manufacturer:Hector MechWorks Facility Alpha,Prosoma War Works,Svarstaad Industriplex Alpha
+primaryfactory:Hector,Valencia,Svarstaad
+systemmanufacturer:CHASSIS:Hellion Light Endo Steel V5
+systemmanufacturer:ENGINE:210 XL
+systemmanufacturer:ARMOR:Compound Gamma Ferro-Fibrous
+systemmanufacturer:COMMUNICATIONS:HCFA 3035 3.0
+systemmanufacturer:TARGETING:HCFA 3047 1.5
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf
index 3e5739dc873..549d48a73ad 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf
@@ -153,5 +153,17 @@ IS Ammo MML-9 SRM
-Empty-
-Empty-
-imagefile:.\data\images\fluff\Mech\3085 Longbow .jpg
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:This upgrade of the 14C removes two of the ER Medium Lasers and replaces them with a Boosted C3 Slave unit. It is otherwise identical to the 14C.
+
+manufacturer:StarCorps Industries,StarCorps (FWL) Industries,StarCorps Industries,StarCorps Industries
+primaryfactory:Crofton,Emris IV,Fletcher (TH),Loburg
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 340
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk II
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Hawk IIC 9.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Hawk IIC 9.mtf
index a5265dce216..f2e19becd2b 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Hawk IIC 9.mtf
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Hawk IIC 9.mtf
@@ -148,4 +148,17 @@ Clan Ferro-Fibrous
-Empty-
-Empty-
+overview:The Shadow Hawk IIC is a second-line Clan BattleMech based upon the Shadow Hawk that was first fielded by the Star League.
+capabilities:The inexpensive unit is protected by seven and a half tons of Ferro-Fibrous armor, mounted on a weight-saving Endo Steel chassis. This medium 'Mech can reach a respectable top speed of 97 km/h, though it also carries enough jump jets to vault up to 180 meters at a time.
+
+deployment:This variant was introduced in the Dark Age. It carries an ER Large Laser, an ATM-6, and two ER Medium Lasers. It has a top speed of 96 km/h, and can jump 180 meters at a time.
+
+manufacturer:Unknown
+primaryfactory:Unknown
+systemmanufacturer:CHASSIS:Lang T3
+systemmanufacturer:ENGINE:Consolidated Fusion 270 Standard
+systemmanufacturer:ARMOR:Compound H17 Ferro-Fibrous
+systemmanufacturer:JUMPJET:Northrup Starlifters M45
+systemmanufacturer:COMMUNICATIONS:JNE Integrated
+systemmanufacturer:TARGETING:TRTTS Mark II
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) Bounty Hunter 2.mtf b/megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) (Bounty Hunter 2).mtf
similarity index 76%
rename from megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) Bounty Hunter 2.mtf
rename to megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) (Bounty Hunter 2).mtf
index 5133fa760df..93ed45229c8 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) Bounty Hunter 2.mtf
+++ b/megamek/data/mechfiles/mechs/Dossiers/Bounty Hunter/Mad Cat (Timber Wolf) (Bounty Hunter 2).mtf
@@ -3,57 +3,58 @@ Mad Cat (Timber Wolf)
(Bounty Hunter 2)
Config:Biped Omnimech
-TechBase:Clan
-Era:3068
-Source:BattleTech Dossiers: The Bounty Hunter - Jihad
-Rules Level:4
-
-Mass:75
-Engine:375 XL (Clan) Engine(IS)
-Structure:Endo Steel
-Myomer:Standard
-
-Heat Sinks:15 Double
-Walk MP:5
-Jump MP:3
-
-Armor:Ferro-Fibrous(Clan)
-LA Armor:24
-RA Armor:24
-LT Armor:25
-RT Armor:25
-CT Armor:36
-HD Armor:9
-LL Armor:32
-RL Armor:32
-RTL Armor:7
-RTR Armor:7
-RTC Armor:9
+techbase:Clan
+era:3068
+source:BattleTech Dossiers: The Bounty Hunter - Jihad
+rules level:4
+
+mass:75
+engine:375 XL (Clan) Engine(IS)
+structure:Clan Endo Steel
+myomer:Standard
+
+heat sinks:15 Clan Double
+base chassis heat sinks:15
+walk mp:5
+jump mp:3
+
+armor:Ferro-Fibrous(Clan)
+LA armor:24
+RA armor:24
+LT armor:25
+RT armor:25
+CT armor:36
+HD armor:9
+LL armor:32
+RL armor:32
+RTL armor:7
+RTR armor:7
+RTC armor:9
Weapons:12
-ER Small Laser, Right Torso
-AP Gauss Rifle, Left Torso
-AP Gauss Rifle, Right Torso
+Large Pulse Laser, Left Arm
ER Medium Laser, Right Arm
ER Medium Laser, Right Arm
-Large Pulse Laser, Left Arm
SRM 4, Left Torso
-Streak SRM 4, Right Torso
SRM 4, Left Torso
SRM 4, Left Torso
+AP Gauss Rifle, Left Torso
+Streak SRM 4, Right Torso
Streak SRM 4, Right Torso
Streak SRM 4, Right Torso
+ER Small Laser, Right Torso
+AP Gauss Rifle, Right Torso
Left Arm:
Shoulder
Upper Arm Actuator
Lower Arm Actuator
-CLLargePulseLaser
-CLLargePulseLaser
-Clan Ammo SRM-4
-CLTargeting Computer
-CLTargeting Computer
-Ferro-Fibrous
+CLLargePulseLaser (OMNIPOD)
+CLLargePulseLaser (OMNIPOD)
+Clan Ammo SRM-4 (OMNIPOD)
+CLTargeting Computer (OMNIPOD)
+CLTargeting Computer (OMNIPOD)
+Clan Ferro-Fibrous
-Empty-
-Empty-
-Empty-
@@ -62,9 +63,9 @@ Right Arm:
Shoulder
Upper Arm Actuator
Lower Arm Actuator
-CLERMediumLaser
-CLERMediumLaser
-Ferro-Fibrous
+CLERMediumLaser (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
+Clan Ferro-Fibrous
-Empty-
-Empty-
-Empty-
@@ -75,30 +76,30 @@ Ferro-Fibrous
Left Torso:
Fusion Engine
Fusion Engine
-Jump Jet
-CLSRM4
-CLSRM4
-CLSRM4
-CLAPGaussRifle
-CLAPGaussRifle Ammo
-Clan Coolant Pod
-Endo Steel
-Ferro-Fibrous
-Ferro-Fibrous
+Jump Jet (OMNIPOD)
+CLSRM4 (OMNIPOD)
+CLSRM4 (OMNIPOD)
+CLSRM4 (OMNIPOD)
+CLAPGaussRifle (OMNIPOD)
+CLAPGaussRifle Ammo (OMNIPOD)
+Coolant Pod (OMNIPOD)
+Clan Endo Steel
+Clan Ferro-Fibrous
+Clan Ferro-Fibrous
Right Torso:
Fusion Engine
Fusion Engine
-Jump Jet
-CLStreakSRM4
-CLStreakSRM4
-CLStreakSRM4
-CLERSmallLaser
-CLAPGaussRifle
-Clan Streak SRM 4 Ammo
-Endo Steel
-Ferro-Fibrous
-Ferro-Fibrous
+Jump Jet (OMNIPOD)
+CLStreakSRM4 (OMNIPOD)
+CLStreakSRM4 (OMNIPOD)
+CLStreakSRM4 (OMNIPOD)
+CLERSmallLaser (OMNIPOD)
+CLAPGaussRifle (OMNIPOD)
+Clan Streak SRM 4 Ammo (OMNIPOD)
+Clan Endo Steel
+Clan Ferro-Fibrous
+Clan Ferro-Fibrous
Center Torso:
Fusion Engine
@@ -112,13 +113,13 @@ Fusion Engine
Fusion Engine
Fusion Engine
Jump Jet
-Endo Steel
+Clan Endo Steel
Head:
Life Support
Sensors
Cockpit
-Ferro-Fibrous
+Clan Ferro-Fibrous
Sensors
Life Support
-Empty-
@@ -133,8 +134,8 @@ Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
-Endo Steel
-Endo Steel
+Clan Endo Steel
+Clan Endo Steel
-Empty-
-Empty-
-Empty-
@@ -147,8 +148,8 @@ Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
-Endo Steel
-Endo Steel
+Clan Endo Steel
+Clan Endo Steel
-Empty-
-Empty-
-Empty-
@@ -157,16 +158,13 @@ Endo Steel
-Empty-
overview:The Timber Wolf is a fast, heavy OmniMech. A signature design of the Clans' military might, it was arguably the first Clan OmniMech encountered by Inner Sphere forces (as opposed to periphery forces) on The Rock in 3049 by Phelan Kell.
-
capabilities:The second custom configuration used by the Bounty Hunter at the start of Jihad mounted a Large Pulse Laser in the left arm and paired ER Medium Lasers in the right arm, supported by a trio of SRM-4s in the left torso and similar trio of Streak SRM-4s in the right. Rounded out by an Anti-Personnel Gauss Rifle in each side torso and a ER Small Laser in the right, the Bounty Hunter's second Mad Cat also mounted a Targeting Computer as well as a Coolant Pod and three Jump Jets to enhance its effectiveness. A single ton of reloads for each weapon type was carried.
-
deployment:Always a MechWarrior, the Bounty Hunter piloted a variety of BattleMechs, typically leading a BattleMech lance. His 'Mechs were invariably painted a bright green with currency symbols on it, a feared sight on the battlefield, and often custom-modified, allowing for his or her PA(L) armor to be worn while piloting to further conceal the pilot's identity. The Bounty Hunter has been active for more than a century, leading to speculation that the PA(L) suit, the modified 'Mechs that he piloted, and even the mythos surrounding the individual were passed from person to person via the death or retirement of the former MechWarrior whose personified him. Known people to have been the Bounty Hunter were Michi Noketsuna and Vic Travers, who inherited the equipment and a book referred to as "the tradition".[1] Travers eventually passed the legacy on to one of his aides going by the name of Walt Urizeman, though that name is held to be just one of the man's several fake identities. The "Bounty Hunter" legend was the topic of a hero team-style tri-vid show called "The Bounty Hunters". Though tapping into the Bounty Hunter's reputation, the producers instead developed their own mythos almost completely unrelated to the real person. The popularity of the series was such that many people in the Inner Sphere cannot separate the fiction of the holovid from the reality of the true Bounty Hunter.
manufacturer:Wolf Clan Site #1, Wolf Clan Site #2, W-7 Facilities, Kallon Weapon Industries
-primaryfactory:Arc-Royal, Strana Mechty, Weingarten, Thermopolis
+primaryfactory:Arc-Royal, Strana Mechty, Weingarten, Thermopolis
systemmanufacturer:CHASSIS:Type W3 Endo-steel
systemmanufacturer:ENGINE:Starfire 375 XL
systemmanufacturer:ARMOR:Composite A-2 Ferro-Fibrous
systemmanufacturer:COMMUNICATIONS:Khan Series (Type 2c)
systemmanufacturer:TARGETING:Series III OPT
-
diff --git a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 13/Daishi (Dire Wolf) T.mtf b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 13/Daishi (Dire Wolf) T.mtf
index 70722603c61..8f9cb163df8 100644
--- a/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 13/Daishi (Dire Wolf) T.mtf
+++ b/megamek/data/mechfiles/mechs/Recognition Guide ilClan/Vol 13/Daishi (Dire Wolf) T.mtf
@@ -1,5 +1,5 @@
Version:1.0
-Daishi (Dire Wolf)
+Daishi (Dire Wolf)
T
Config:Biped Omnimech
@@ -47,58 +47,58 @@ Streak LRM 10, Left Torso
Left Arm:
Shoulder
Upper Arm Actuator
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLERMediumLaser
-CLERMediumLaser
-CLMediumPulseLaser
-CLMediumPulseLaser
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
+CLMediumPulseLaser (OMNIPOD)
+CLMediumPulseLaser (OMNIPOD)
Right Arm:
Shoulder
Upper Arm Actuator
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLHAG20
-CLERMediumLaser
-CLERMediumLaser
-CLMediumPulseLaser
-CLMediumPulseLaser
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLHAG20 (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
+CLERMediumLaser (OMNIPOD)
+CLMediumPulseLaser (OMNIPOD)
+CLMediumPulseLaser (OMNIPOD)
Left Torso:
Fusion Engine
Fusion Engine
CLDoubleHeatSink
CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-CLStreakLRM10
-CLStreakLRM10
-Clan Streak LRM 10 Ammo
-Hyper-Assault Gauss Rifle/20 Ammo
-Hyper-Assault Gauss Rifle/20 Ammo
-Supercharger (Clan)
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+CLStreakLRM10 (OMNIPOD)
+CLStreakLRM10 (OMNIPOD)
+Clan Streak LRM 10 Ammo (OMNIPOD)
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
+Supercharger (Clan) (OMNIPOD)
Right Torso:
Fusion Engine
Fusion Engine
CLDoubleHeatSink
CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-CLDoubleHeatSink
-Hyper-Assault Gauss Rifle/20 Ammo
-Hyper-Assault Gauss Rifle/20 Ammo
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
Center Torso:
Fusion Engine
@@ -111,14 +111,14 @@ Gyro
Fusion Engine
Fusion Engine
Fusion Engine
-Hyper-Assault Gauss Rifle/20 Ammo
-Hyper-Assault Gauss Rifle/20 Ammo
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
+Hyper-Assault Gauss Rifle/20 Ammo (OMNIPOD)
Head:
Life Support
Sensors
Cockpit
-CLLightActiveProbe
+CLLightActiveProbe (OMNIPOD)
Sensors
Life Support
-Empty-
@@ -147,8 +147,8 @@ Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
-CLDoubleHeatSink
-CLDoubleHeatSink
+CLDoubleHeatSink (OMNIPOD)
+CLDoubleHeatSink (OMNIPOD)
-Empty-
-Empty-
-Empty-
@@ -156,14 +156,10 @@ CLDoubleHeatSink
-Empty-
-Empty-
-overview:The Dire Wolf is one of the OmniMechs that became feared throughout the Inner Sphere during the initial Clan Invasion and rightly so.
-
+overview:The Dire Wolf is one of the OmniMechs that became feared throughout the Inner Sphere during the initial Clan Invasion and rightly so.
capabilities:The Dire Wolf weighs in at an impressive one hundred tons and has a relatively slow cruising speed of 54 km/h provided by a 300 XL engine. Its speed and armor protection matches that of an Atlas, but it has superior potential firepower with fifty and a half tons of free pod space for weapons and equipment. It is these traits which saw the 'Mech christened Daishi (pseudo-Japanese for "Great Death") by the criminal underbelly of the Draconis Combine, a name that would be proven grimly accurate time and time again.
-
deployment:This Clan Hell's Horses configuration was introduced in 3149. Each arm carries a HAG 20, two ER Medium Lasers, and two Medium Pulse Lasers. For long range support a Streak LRM-10 is carried in the left torso. To increase speed, an engine Supercharger is fitted as well. A Light Active Probe detects hidden foes. Five extra double heat sinks are carried as well.
-
history:The Dire Wolf was the brainchild of the Clan Wolf scientist caste, but was actually first produced by Clan Smoke Jaguar. Hearing rumors that Clan Wolf was developing the "Ultimate Assault OmniMech", the Jaguars won the plans and production rights in a trial that, rumor has it, was fought dishonorably. Production commenced on Huntress in 3010. In 3019, Clan Wolf began production of the OmniMech on Strana Mechty as well; Star Colonel Ulric won a trial of possession to expand manufacture into Clan Wolf. Beyond the limited manufacture of the Dire Wolf on Outreach, all Dire Wolves outside of Clans Smoke Jaguar and Wolf (or the Wolf's Dragoons) are either gifts, isorla, or were acquired through trade.
-
manufacturer:Phan Industriplex, Wolf Clan Site #1, Svarstaad Industriplex Delta
primaryfactory:Huntress, Strana Mechty, Svarstaad
systemmanufacturer:CHASSIS:Titan HX
@@ -171,3 +167,4 @@ systemmanufacturer:ENGINE:Starfire 300 XL
systemmanufacturer:ARMOR:Compound 12B2 Standard
systemmanufacturer:COMMUNICATIONS:TJ6 “Bell” Integrated Communication System
systemmanufacturer:TARGETING:Mars System 9
+
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf
index fe2515472ab..35ef599a0c3 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf
@@ -151,4 +151,16 @@ Heat Sink
-Empty-
-Empty-
+overview:The Longbow, introduced in 2480 as the LGB-0C Longbow, has seen service in the armies of the Inner Sphere since the days of the Star League and is one of the most well-known fire support 'Mechs in existence.
+capabilities:The Longbow is a massive BattleMech weighing in at 85 tons and is able to move at a top speed of 54.0 km/h, thanks to a Strand 255 fusion engine. The Longbow is protected by fourteen and a half tons of armor. Some have criticized the design for its lack of CASE - making an otherwise rugged 'Mech vulnerable to a loss by an ammunition explosion. As a fire-support 'Mech though, the Longbow is a trusted and reliable machine that can be counted on to carry out the mission it is designed for.
+
+deployment:The original Longbow built in 2480, this Free Worlds League design carried twin LRM-20s each with three tons of ammunition, supported by two Medium Lasers and a Small Laser. The Primitive Technology used limited the design's top speed to 54km/h, but this was deemed acceptable for a fire support unit. The location of the LRM launchers in the arms allowed it to fire in a wider arc, a feature prized by pilots. The Primitive Armor provided some protection, but many felt it was too thin. This design would go on to become one of the most popular and widely distributed as the manufacturer, Lockenburg-Holly Industries, merged with several other manufacturers to form StarCorps Industries.[2]
+
+manufacturer:Lockenburg-Holly Industries
+primaryfactory:Emris IV
+systemmanufacturer:CHASSIS:StarCorps 100 LGB
+systemmanufacturer:ENGINE:Strand 255
+systemmanufacturer:ARMOR:StarSlab/9.5 Mk I
+systemmanufacturer:COMMUNICATIONS:O/P 3000 COMSET
+systemmanufacturer:TARGETING:Octagon Tartrac System C
diff --git a/megamek/data/unit_roles.txt b/megamek/data/unit_roles.txt
index d00ecfacb8f..cce29f466ce 100644
--- a/megamek/data/unit_roles.txt
+++ b/megamek/data/unit_roles.txt
@@ -2142,8 +2142,6 @@ Hellhound (Conjurer) 5:SKIRMISHER
Hellion A:MISSILE_BOAT
Hellion B:STRIKER
Hellion C:STRIKER
-Hellion D:STRIKER
-Hellion E:STRIKER
Hellion F:STRIKER
Hellion G:STRIKER
Hellion Prime:STRIKER
@@ -4216,8 +4214,6 @@ Shadow Cat II 4:SNIPER
Shadow Cat J:STRIKER
Shadow Cat Prime:STRIKER
Shadow Hawk C:SKIRMISHER
-Shadow Hawk IIC (Standard):STRIKER
-Shadow Hawk IIC 2:STRIKER
Shadow Hawk IIC 3:STRIKER
Shadow Hawk IIC 4:STRIKER
Shadow Hawk IIC 5:SCOUT
@@ -5900,6 +5896,32 @@ Iron Cheetah C:BRAWLER
Iron Cheetah D:BRAWLER
Iron Cheetah L:BRAWLER
#ilClan Rec Guide 20
+Hellion T:STRIKER
+Hellion D:STRIKER
+Hellion E:STRIKER
+Hellion F:STRIKER
+Hellion P:STRIKER
+Shadow Hawk IIC (Standard):STRIKER
+Shadow Hawk IIC 2:STRIKER
+Shadow Hawk IIC 10:STRIKER
+Shadow Hawk IIC 11:STRIKER
+Longbow LGB-0H:SNIPER
+Longbow LGB-0W2:MISSILE_BOAT
+Longbow LGB-8C:MISSILE_BOAT
+Longbow LGB-10C:MISSILE_BOAT
+Longbow LGB-10K:JUGGERNAUT
+Longbow LGB-14Q:MISSILE_BOAT
+Longbow LGB-14V:BRAWLER
+Masakari (Warhawk) T:BRAWLER
+Masakari (Warhawk) F:SNIPER
+Masakari (Warhawk) G:JUGGERNAUT
+Masakari (Warhawk) I:SNIPER
+Masakari (Warhawk) L:BRAWLER
+Mastodon Prime:SNIPER
+Mastodon A:SNIPER
+Mastodon B:JUGGERNAUT
+Mastodon C:JUGGERNAUT
+Mastodon D:MISSILE_BOAT
#ilClan Rec Guide 21
#ilClan Rec Guide 22
#ilClan Rec Guide 23
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index e5c3c72caad..936c159cecd 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -1,6 +1,7 @@
VERSION HISTORY:
----------------
0.49.5-SNAPSHOT
++ Data: New Sprites and unit file fixes.
0.49.4 (2021-10-30 1800 UTC)
+ PR #3079: Skill Generation Rework