Merge branch 'MegaMek:master' into campaignOptionsIIC

MegaMek · Oct 2, 2024 · b56cafd · b56cafd
2 parents aa3d586 + 0ef9cf2
commit b56cafd
Show file tree

Hide file tree

Showing 261 changed files with 5,466 additions and 4,225 deletions.
diff --git a/...ces/Logos/Periphery/New Dephi Compact.png → ...es/Logos/Periphery/New Delphi Compact.png b/...ces/Logos/Periphery/New Dephi Compact.png → ...es/Logos/Periphery/New Delphi Compact.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_1.png → ...its/Female/Aerospace Tech/AeroTek_F_1.png b/...aits/Female/Aerospace Tek/AeroTek_F_1.png → ...its/Female/Aerospace Tech/AeroTek_F_1.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_10.png → ...ts/Female/Aerospace Tech/AeroTek_F_10.png b/...its/Female/Aerospace Tek/AeroTek_F_10.png → ...ts/Female/Aerospace Tech/AeroTek_F_10.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_11.png → ...ts/Female/Aerospace Tech/AeroTek_F_11.png b/...its/Female/Aerospace Tek/AeroTek_F_11.png → ...ts/Female/Aerospace Tech/AeroTek_F_11.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_12.png → ...ts/Female/Aerospace Tech/AeroTek_F_12.png b/...its/Female/Aerospace Tek/AeroTek_F_12.png → ...ts/Female/Aerospace Tech/AeroTek_F_12.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_13.png → ...ts/Female/Aerospace Tech/AeroTek_F_13.png b/...its/Female/Aerospace Tek/AeroTek_F_13.png → ...ts/Female/Aerospace Tech/AeroTek_F_13.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_14.png → ...ts/Female/Aerospace Tech/AeroTek_F_14.png b/...its/Female/Aerospace Tek/AeroTek_F_14.png → ...ts/Female/Aerospace Tech/AeroTek_F_14.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_15.png → ...ts/Female/Aerospace Tech/AeroTek_F_15.png b/...its/Female/Aerospace Tek/AeroTek_F_15.png → ...ts/Female/Aerospace Tech/AeroTek_F_15.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_16.png → ...ts/Female/Aerospace Tech/AeroTek_F_16.png b/...its/Female/Aerospace Tek/AeroTek_F_16.png → ...ts/Female/Aerospace Tech/AeroTek_F_16.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_17.png → ...ts/Female/Aerospace Tech/AeroTek_F_17.png b/...its/Female/Aerospace Tek/AeroTek_F_17.png → ...ts/Female/Aerospace Tech/AeroTek_F_17.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_18.png → ...ts/Female/Aerospace Tech/AeroTek_F_18.png b/...its/Female/Aerospace Tek/AeroTek_F_18.png → ...ts/Female/Aerospace Tech/AeroTek_F_18.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_19.png → ...ts/Female/Aerospace Tech/AeroTek_F_19.png b/...its/Female/Aerospace Tek/AeroTek_F_19.png → ...ts/Female/Aerospace Tech/AeroTek_F_19.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_2.png → ...its/Female/Aerospace Tech/AeroTek_F_2.png b/...aits/Female/Aerospace Tek/AeroTek_F_2.png → ...its/Female/Aerospace Tech/AeroTek_F_2.png
diff --git a/...its/Female/Aerospace Tek/AeroTek_F_20.png → ...ts/Female/Aerospace Tech/AeroTek_F_20.png b/...its/Female/Aerospace Tek/AeroTek_F_20.png → ...ts/Female/Aerospace Tech/AeroTek_F_20.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_3.png → ...its/Female/Aerospace Tech/AeroTek_F_3.png b/...aits/Female/Aerospace Tek/AeroTek_F_3.png → ...its/Female/Aerospace Tech/AeroTek_F_3.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_4.png → ...its/Female/Aerospace Tech/AeroTek_F_4.png b/...aits/Female/Aerospace Tek/AeroTek_F_4.png → ...its/Female/Aerospace Tech/AeroTek_F_4.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_5.png → ...its/Female/Aerospace Tech/AeroTek_F_5.png b/...aits/Female/Aerospace Tek/AeroTek_F_5.png → ...its/Female/Aerospace Tech/AeroTek_F_5.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_6.png → ...its/Female/Aerospace Tech/AeroTek_F_6.png b/...aits/Female/Aerospace Tek/AeroTek_F_6.png → ...its/Female/Aerospace Tech/AeroTek_F_6.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_7.png → ...its/Female/Aerospace Tech/AeroTek_F_7.png b/...aits/Female/Aerospace Tek/AeroTek_F_7.png → ...its/Female/Aerospace Tech/AeroTek_F_7.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_8.png → ...its/Female/Aerospace Tech/AeroTek_F_8.png b/...aits/Female/Aerospace Tek/AeroTek_F_8.png → ...its/Female/Aerospace Tech/AeroTek_F_8.png
diff --git a/...aits/Female/Aerospace Tek/AeroTek_F_9.png → ...its/Female/Aerospace Tech/AeroTek_F_9.png b/...aits/Female/Aerospace Tek/AeroTek_F_9.png → ...its/Female/Aerospace Tech/AeroTek_F_9.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_1.png → .../portraits/Female/Mek Tech/MekTek_F_1.png b/...s/portraits/Female/Mek Tek/MekTek_F_1.png → .../portraits/Female/Mek Tech/MekTek_F_1.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_10.png → ...portraits/Female/Mek Tech/MekTek_F_10.png b/.../portraits/Female/Mek Tek/MekTek_F_10.png → ...portraits/Female/Mek Tech/MekTek_F_10.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_11.png → ...portraits/Female/Mek Tech/MekTek_F_11.png b/.../portraits/Female/Mek Tek/MekTek_F_11.png → ...portraits/Female/Mek Tech/MekTek_F_11.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_12.png → ...portraits/Female/Mek Tech/MekTek_F_12.png b/.../portraits/Female/Mek Tek/MekTek_F_12.png → ...portraits/Female/Mek Tech/MekTek_F_12.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_13.png → ...portraits/Female/Mek Tech/MekTek_F_13.png b/.../portraits/Female/Mek Tek/MekTek_F_13.png → ...portraits/Female/Mek Tech/MekTek_F_13.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_14.png → ...portraits/Female/Mek Tech/MekTek_F_14.png b/.../portraits/Female/Mek Tek/MekTek_F_14.png → ...portraits/Female/Mek Tech/MekTek_F_14.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_15.png → ...portraits/Female/Mek Tech/MekTek_F_15.png b/.../portraits/Female/Mek Tek/MekTek_F_15.png → ...portraits/Female/Mek Tech/MekTek_F_15.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_16.png → ...portraits/Female/Mek Tech/MekTek_F_16.png b/.../portraits/Female/Mek Tek/MekTek_F_16.png → ...portraits/Female/Mek Tech/MekTek_F_16.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_17.png → ...portraits/Female/Mek Tech/MekTek_F_17.png b/.../portraits/Female/Mek Tek/MekTek_F_17.png → ...portraits/Female/Mek Tech/MekTek_F_17.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_18.png → ...portraits/Female/Mek Tech/MekTek_F_18.png b/.../portraits/Female/Mek Tek/MekTek_F_18.png → ...portraits/Female/Mek Tech/MekTek_F_18.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_19.png → ...portraits/Female/Mek Tech/MekTek_F_19.png b/.../portraits/Female/Mek Tek/MekTek_F_19.png → ...portraits/Female/Mek Tech/MekTek_F_19.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_2.png → .../portraits/Female/Mek Tech/MekTek_F_2.png b/...s/portraits/Female/Mek Tek/MekTek_F_2.png → .../portraits/Female/Mek Tech/MekTek_F_2.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_20.png → ...portraits/Female/Mek Tech/MekTek_F_20.png b/.../portraits/Female/Mek Tek/MekTek_F_20.png → ...portraits/Female/Mek Tech/MekTek_F_20.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_21.png → ...portraits/Female/Mek Tech/MekTek_F_21.png b/.../portraits/Female/Mek Tek/MekTek_F_21.png → ...portraits/Female/Mek Tech/MekTek_F_21.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_22.png → ...portraits/Female/Mek Tech/MekTek_F_22.png b/.../portraits/Female/Mek Tek/MekTek_F_22.png → ...portraits/Female/Mek Tech/MekTek_F_22.png
diff --git a/.../portraits/Female/Mek Tek/MekTek_F_23.png → ...portraits/Female/Mek Tech/MekTek_F_23.png b/.../portraits/Female/Mek Tek/MekTek_F_23.png → ...portraits/Female/Mek Tech/MekTek_F_23.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_3.png → .../portraits/Female/Mek Tech/MekTek_F_3.png b/...s/portraits/Female/Mek Tek/MekTek_F_3.png → .../portraits/Female/Mek Tech/MekTek_F_3.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_4.png → .../portraits/Female/Mek Tech/MekTek_F_4.png b/...s/portraits/Female/Mek Tek/MekTek_F_4.png → .../portraits/Female/Mek Tech/MekTek_F_4.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_5.png → .../portraits/Female/Mek Tech/MekTek_F_5.png b/...s/portraits/Female/Mek Tek/MekTek_F_5.png → .../portraits/Female/Mek Tech/MekTek_F_5.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_6.png → .../portraits/Female/Mek Tech/MekTek_F_6.png b/...s/portraits/Female/Mek Tek/MekTek_F_6.png → .../portraits/Female/Mek Tech/MekTek_F_6.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_7.png → .../portraits/Female/Mek Tech/MekTek_F_7.png b/...s/portraits/Female/Mek Tek/MekTek_F_7.png → .../portraits/Female/Mek Tech/MekTek_F_7.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_8.png → .../portraits/Female/Mek Tech/MekTek_F_8.png b/...s/portraits/Female/Mek Tek/MekTek_F_8.png → .../portraits/Female/Mek Tech/MekTek_F_8.png
diff --git a/...s/portraits/Female/Mek Tek/MekTek_F_9.png → .../portraits/Female/Mek Tech/MekTek_F_9.png b/...s/portraits/Female/Mek Tek/MekTek_F_9.png → .../portraits/Female/Mek Tech/MekTek_F_9.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_1.png → ...raits/Male/Aerospace Tech/AeroTek_M_1.png b/...traits/Male/Aerospace Tek/AeroTek_M_1.png → ...raits/Male/Aerospace Tech/AeroTek_M_1.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_10.png → ...aits/Male/Aerospace Tech/AeroTek_M_10.png b/...raits/Male/Aerospace Tek/AeroTek_M_10.png → ...aits/Male/Aerospace Tech/AeroTek_M_10.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_11.png → ...aits/Male/Aerospace Tech/AeroTek_M_11.png b/...raits/Male/Aerospace Tek/AeroTek_M_11.png → ...aits/Male/Aerospace Tech/AeroTek_M_11.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_12.png → ...aits/Male/Aerospace Tech/AeroTek_M_12.png b/...raits/Male/Aerospace Tek/AeroTek_M_12.png → ...aits/Male/Aerospace Tech/AeroTek_M_12.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_13.png → ...aits/Male/Aerospace Tech/AeroTek_M_13.png b/...raits/Male/Aerospace Tek/AeroTek_M_13.png → ...aits/Male/Aerospace Tech/AeroTek_M_13.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_14.png → ...aits/Male/Aerospace Tech/AeroTek_M_14.png b/...raits/Male/Aerospace Tek/AeroTek_M_14.png → ...aits/Male/Aerospace Tech/AeroTek_M_14.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_15.png → ...aits/Male/Aerospace Tech/AeroTek_M_15.png b/...raits/Male/Aerospace Tek/AeroTek_M_15.png → ...aits/Male/Aerospace Tech/AeroTek_M_15.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_16.png → ...aits/Male/Aerospace Tech/AeroTek_M_16.png b/...raits/Male/Aerospace Tek/AeroTek_M_16.png → ...aits/Male/Aerospace Tech/AeroTek_M_16.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_17.png → ...aits/Male/Aerospace Tech/AeroTek_M_17.png b/...raits/Male/Aerospace Tek/AeroTek_M_17.png → ...aits/Male/Aerospace Tech/AeroTek_M_17.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_18.png → ...aits/Male/Aerospace Tech/AeroTek_M_18.png b/...raits/Male/Aerospace Tek/AeroTek_M_18.png → ...aits/Male/Aerospace Tech/AeroTek_M_18.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_19.png → ...aits/Male/Aerospace Tech/AeroTek_M_19.png b/...raits/Male/Aerospace Tek/AeroTek_M_19.png → ...aits/Male/Aerospace Tech/AeroTek_M_19.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_2.png → ...raits/Male/Aerospace Tech/AeroTek_M_2.png b/...traits/Male/Aerospace Tek/AeroTek_M_2.png → ...raits/Male/Aerospace Tech/AeroTek_M_2.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_20.png → ...aits/Male/Aerospace Tech/AeroTek_M_20.png b/...raits/Male/Aerospace Tek/AeroTek_M_20.png → ...aits/Male/Aerospace Tech/AeroTek_M_20.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_21.png → ...aits/Male/Aerospace Tech/AeroTek_M_21.png b/...raits/Male/Aerospace Tek/AeroTek_M_21.png → ...aits/Male/Aerospace Tech/AeroTek_M_21.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_22.png → ...aits/Male/Aerospace Tech/AeroTek_M_22.png b/...raits/Male/Aerospace Tek/AeroTek_M_22.png → ...aits/Male/Aerospace Tech/AeroTek_M_22.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_23.png → ...aits/Male/Aerospace Tech/AeroTek_M_23.png b/...raits/Male/Aerospace Tek/AeroTek_M_23.png → ...aits/Male/Aerospace Tech/AeroTek_M_23.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_24.png → ...aits/Male/Aerospace Tech/AeroTek_M_24.png b/...raits/Male/Aerospace Tek/AeroTek_M_24.png → ...aits/Male/Aerospace Tech/AeroTek_M_24.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_25.png → ...aits/Male/Aerospace Tech/AeroTek_M_25.png b/...raits/Male/Aerospace Tek/AeroTek_M_25.png → ...aits/Male/Aerospace Tech/AeroTek_M_25.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_26.png → ...aits/Male/Aerospace Tech/AeroTek_M_26.png b/...raits/Male/Aerospace Tek/AeroTek_M_26.png → ...aits/Male/Aerospace Tech/AeroTek_M_26.png
diff --git a/...raits/Male/Aerospace Tek/AeroTek_M_27.png → ...aits/Male/Aerospace Tech/AeroTek_M_27.png b/...raits/Male/Aerospace Tek/AeroTek_M_27.png → ...aits/Male/Aerospace Tech/AeroTek_M_27.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_3.png → ...raits/Male/Aerospace Tech/AeroTek_M_3.png b/...traits/Male/Aerospace Tek/AeroTek_M_3.png → ...raits/Male/Aerospace Tech/AeroTek_M_3.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_4.png → ...raits/Male/Aerospace Tech/AeroTek_M_4.png b/...traits/Male/Aerospace Tek/AeroTek_M_4.png → ...raits/Male/Aerospace Tech/AeroTek_M_4.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_5.png → ...raits/Male/Aerospace Tech/AeroTek_M_5.png b/...traits/Male/Aerospace Tek/AeroTek_M_5.png → ...raits/Male/Aerospace Tech/AeroTek_M_5.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_6.png → ...raits/Male/Aerospace Tech/AeroTek_M_6.png b/...traits/Male/Aerospace Tek/AeroTek_M_6.png → ...raits/Male/Aerospace Tech/AeroTek_M_6.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_7.png → ...raits/Male/Aerospace Tech/AeroTek_M_7.png b/...traits/Male/Aerospace Tek/AeroTek_M_7.png → ...raits/Male/Aerospace Tech/AeroTek_M_7.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_8.png → ...raits/Male/Aerospace Tech/AeroTek_M_8.png b/...traits/Male/Aerospace Tek/AeroTek_M_8.png → ...raits/Male/Aerospace Tech/AeroTek_M_8.png
diff --git a/...traits/Male/Aerospace Tek/AeroTek_M_9.png → ...raits/Male/Aerospace Tech/AeroTek_M_9.png b/...traits/Male/Aerospace Tek/AeroTek_M_9.png → ...raits/Male/Aerospace Tech/AeroTek_M_9.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_1.png → ...es/portraits/Male/Mek Tech/MekTek_M_1.png b/...ges/portraits/Male/Mek Tek/MekTek_M_1.png → ...es/portraits/Male/Mek Tech/MekTek_M_1.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_10.png → ...s/portraits/Male/Mek Tech/MekTek_M_10.png b/...es/portraits/Male/Mek Tek/MekTek_M_10.png → ...s/portraits/Male/Mek Tech/MekTek_M_10.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_11.png → ...s/portraits/Male/Mek Tech/MekTek_M_11.png b/...es/portraits/Male/Mek Tek/MekTek_M_11.png → ...s/portraits/Male/Mek Tech/MekTek_M_11.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_12.png → ...s/portraits/Male/Mek Tech/MekTek_M_12.png b/...es/portraits/Male/Mek Tek/MekTek_M_12.png → ...s/portraits/Male/Mek Tech/MekTek_M_12.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_13.png → ...s/portraits/Male/Mek Tech/MekTek_M_13.png b/...es/portraits/Male/Mek Tek/MekTek_M_13.png → ...s/portraits/Male/Mek Tech/MekTek_M_13.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_14.png → ...s/portraits/Male/Mek Tech/MekTek_M_14.png b/...es/portraits/Male/Mek Tek/MekTek_M_14.png → ...s/portraits/Male/Mek Tech/MekTek_M_14.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_15.png → ...s/portraits/Male/Mek Tech/MekTek_M_15.png b/...es/portraits/Male/Mek Tek/MekTek_M_15.png → ...s/portraits/Male/Mek Tech/MekTek_M_15.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_16.png → ...s/portraits/Male/Mek Tech/MekTek_M_16.png b/...es/portraits/Male/Mek Tek/MekTek_M_16.png → ...s/portraits/Male/Mek Tech/MekTek_M_16.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_17.png → ...s/portraits/Male/Mek Tech/MekTek_M_17.png b/...es/portraits/Male/Mek Tek/MekTek_M_17.png → ...s/portraits/Male/Mek Tech/MekTek_M_17.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_18.png → ...s/portraits/Male/Mek Tech/MekTek_M_18.png b/...es/portraits/Male/Mek Tek/MekTek_M_18.png → ...s/portraits/Male/Mek Tech/MekTek_M_18.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_19.png → ...s/portraits/Male/Mek Tech/MekTek_M_19.png b/...es/portraits/Male/Mek Tek/MekTek_M_19.png → ...s/portraits/Male/Mek Tech/MekTek_M_19.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_2.png → ...es/portraits/Male/Mek Tech/MekTek_M_2.png b/...ges/portraits/Male/Mek Tek/MekTek_M_2.png → ...es/portraits/Male/Mek Tech/MekTek_M_2.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_20.png → ...s/portraits/Male/Mek Tech/MekTek_M_20.png b/...es/portraits/Male/Mek Tek/MekTek_M_20.png → ...s/portraits/Male/Mek Tech/MekTek_M_20.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_21.png → ...s/portraits/Male/Mek Tech/MekTek_M_21.png b/...es/portraits/Male/Mek Tek/MekTek_M_21.png → ...s/portraits/Male/Mek Tech/MekTek_M_21.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_22.png → ...s/portraits/Male/Mek Tech/MekTek_M_22.png b/...es/portraits/Male/Mek Tek/MekTek_M_22.png → ...s/portraits/Male/Mek Tech/MekTek_M_22.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_23.png → ...s/portraits/Male/Mek Tech/MekTek_M_23.png b/...es/portraits/Male/Mek Tek/MekTek_M_23.png → ...s/portraits/Male/Mek Tech/MekTek_M_23.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_24.png → ...s/portraits/Male/Mek Tech/MekTek_M_24.png b/...es/portraits/Male/Mek Tek/MekTek_M_24.png → ...s/portraits/Male/Mek Tech/MekTek_M_24.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_25.png → ...s/portraits/Male/Mek Tech/MekTek_M_25.png b/...es/portraits/Male/Mek Tek/MekTek_M_25.png → ...s/portraits/Male/Mek Tech/MekTek_M_25.png
diff --git a/...es/portraits/Male/Mek Tek/MekTek_M_26.png → ...s/portraits/Male/Mek Tech/MekTek_M_26.png b/...es/portraits/Male/Mek Tek/MekTek_M_26.png → ...s/portraits/Male/Mek Tech/MekTek_M_26.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_3.png → ...es/portraits/Male/Mek Tech/MekTek_M_3.png b/...ges/portraits/Male/Mek Tek/MekTek_M_3.png → ...es/portraits/Male/Mek Tech/MekTek_M_3.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_4.png → ...es/portraits/Male/Mek Tech/MekTek_M_4.png b/...ges/portraits/Male/Mek Tek/MekTek_M_4.png → ...es/portraits/Male/Mek Tech/MekTek_M_4.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_5.png → ...es/portraits/Male/Mek Tech/MekTek_M_5.png b/...ges/portraits/Male/Mek Tek/MekTek_M_5.png → ...es/portraits/Male/Mek Tech/MekTek_M_5.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_6.png → ...es/portraits/Male/Mek Tech/MekTek_M_6.png b/...ges/portraits/Male/Mek Tek/MekTek_M_6.png → ...es/portraits/Male/Mek Tech/MekTek_M_6.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_7.png → ...es/portraits/Male/Mek Tech/MekTek_M_7.png b/...ges/portraits/Male/Mek Tek/MekTek_M_7.png → ...es/portraits/Male/Mek Tech/MekTek_M_7.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_8.png → ...es/portraits/Male/Mek Tech/MekTek_M_8.png b/...ges/portraits/Male/Mek Tek/MekTek_M_8.png → ...es/portraits/Male/Mek Tech/MekTek_M_8.png
diff --git a/...ges/portraits/Male/Mek Tek/MekTek_M_9.png → ...es/portraits/Male/Mek Tech/MekTek_M_9.png b/...ges/portraits/Male/Mek Tek/MekTek_M_9.png → ...es/portraits/Male/Mek Tech/MekTek_M_9.png
diff --git a/MekHQ/data/images/universe/factions/logo_star_league_green.png b/MekHQ/data/images/universe/factions/logo_star_league_green.png
diff --git a/MekHQ/data/images/universe/factions/logo_star_league_orange.png b/MekHQ/data/images/universe/factions/logo_star_league_orange.png
diff --git a/MekHQ/data/images/universe/factions/logo_star_league_red.png b/MekHQ/data/images/universe/factions/logo_star_league_red.png
diff --git a/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml b/MekHQ/data/scenariomodifiers/AlliedAirGarrison.xml
@@ -10,7 +10,7 @@
 		<canReinforceLinked>false</canReinforceLinked>
 		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deployOffboard>false</deployOffboard>
 		<deploymentZones>
 			<deploymentZone>10</deploymentZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml b/MekHQ/data/scenariomodifiers/AlliedArtyGarrison.xml
@@ -15,7 +15,7 @@
 		<canReinforceLinked>false</canReinforceLinked>
 		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deployOffboard>false</deployOffboard>
 		<deploymentZones>
 			<deploymentZone>10</deploymentZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml b/MekHQ/data/scenariomodifiers/AlliedGroundSupport.xml
@@ -14,7 +14,7 @@
 		<canReinforceLinked>true</canReinforceLinked>
 		<contributesToBV>false</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deploymentZones>
 			<deploymentZone>1</deploymentZone>
 			<deploymentZone>2</deploymentZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml b/MekHQ/data/scenariomodifiers/AlliedOfficerMek.xml
@@ -4,17 +4,17 @@
 		<allowedMapLocation>AllGroundTerrain</allowedMapLocation>
 		<allowedMapLocation>SpecificGroundTerrain</allowedMapLocation>
 	</allowedMapLocations>
-	<benefitsPlayer>false</benefitsPlayer>
+	<benefitsPlayer>true</benefitsPlayer>
 	<eventTiming>PreForceGeneration</eventTiming>
 	<forceDefinition>
 		<actualDeploymentZone>-1</actualDeploymentZone>
 		<allowAeroBombs>false</allowAeroBombs>
 		<allowedUnitType>0</allowedUnitType>
 		<arrivalTurn>0</arrivalTurn>
 		<canReinforceLinked>false</canReinforceLinked>
-		<contributesToBV>false</contributesToBV>
+		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deployOffboard>false</deployOffboard>
 		<deploymentZones />
 		<destinationZone>5</destinationZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml b/MekHQ/data/scenariomodifiers/AlliedReinforcements.xml
@@ -14,7 +14,7 @@
 		<canReinforceLinked>true</canReinforceLinked>
 		<contributesToBV>false</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deploymentZones>
 			<deploymentZone>1</deploymentZone>
 			<deploymentZone>2</deploymentZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml b/MekHQ/data/scenariomodifiers/AlliedTankReinforcements.xml
@@ -14,7 +14,7 @@
 		<canReinforceLinked>true</canReinforceLinked>
 		<contributesToBV>false</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deploymentZones>
 			<deploymentZone>1</deploymentZone>
 			<deploymentZone>2</deploymentZone>

diff --git a/MekHQ/data/scenariomodifiers/AlliedTurrets.xml b/MekHQ/data/scenariomodifiers/AlliedTurrets.xml
@@ -12,7 +12,7 @@
 		<allowedUnitType>7</allowedUnitType>
 		<arrivalTurn>0</arrivalTurn>
 		<canReinforceLinked>false</canReinforceLinked>
-		<contributesToBV>false</contributesToBV>
+		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
 		<contributesToUnitCount>false</contributesToUnitCount>
 		<deploymentZones>
@@ -28,7 +28,7 @@
 		<maxWeightClass>4</maxWeightClass>
 		<retreatThreshold>50</retreatThreshold>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Base Turrets</objectiveLinkedForce>
+			<objectiveLinkedForce>Base Defenses</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>None</syncDeploymentType>
 	</forceDefinition>

diff --git a/MekHQ/data/scenariomodifiers/ArmednArmored.xml b/MekHQ/data/scenariomodifiers/ArmednArmored.xml
@@ -1,5 +1,5 @@
 <AtBScenarioModifier>
-	<additionalBriefingText>Intel on the Opfor indicates a larger more well-equipped force.</additionalBriefingText>
+	<additionalBriefingText>Intel on the OpFor indicates a larger more well-equipped force.</additionalBriefingText>
 	<benefitsPlayer>false</benefitsPlayer>
 	<eventTiming>PreForceGeneration</eventTiming>
 	<eventRecipient>Opposing</eventRecipient>

diff --git a/MekHQ/data/scenariomodifiers/BadIntelAir.xml b/MekHQ/data/scenariomodifiers/BadIntelAir.xml
@@ -27,13 +27,13 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Additional OpFor Aircraft</forceName>
+		<forceName>Additional Aircraft</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>3</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<retreatThreshold>0</retreatThreshold>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<startingAltitude>5</startingAltitude>
 		<syncDeploymentType>None</syncDeploymentType>

diff --git a/MekHQ/data/scenariomodifiers/BadIntelGround.xml b/MekHQ/data/scenariomodifiers/BadIntelGround.xml
@@ -31,13 +31,13 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Additional Opfor Ground Units</forceName>
+		<forceName>Additional Ground Units</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>3</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<retreatThreshold>0</retreatThreshold>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>None</syncDeploymentType>
 		<syncedForceName />

diff --git a/MekHQ/data/scenariomodifiers/Elites.xml b/MekHQ/data/scenariomodifiers/Elites.xml
@@ -1,5 +1,5 @@
 <AtBScenarioModifier>
-	<additionalBriefingText>Opfor markings indicate an elite force.</additionalBriefingText>
+	<additionalBriefingText>OpFor markings indicate an elite force.</additionalBriefingText>
 	<benefitsPlayer>false</benefitsPlayer>
 	<eventTiming>PostForceGeneration</eventTiming>
 	<eventRecipient>Opposing</eventRecipient>

diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce01.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml b/MekHQ/data/scenariomodifiers/EnemyASFAce02.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekARC2R.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekAWS8Q.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekFS9M.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekGHR5N.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekHGN733P.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekMAD3D.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml b/MekHQ/data/scenariomodifiers/EnemyAceMekPXH1D.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyAirCav.xml b/MekHQ/data/scenariomodifiers/EnemyAirCav.xml
@@ -39,7 +39,7 @@
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>1</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>None</syncDeploymentType>
 		<useArtillery>false</useArtillery>

diff --git a/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyAirGarrison.xml
@@ -19,12 +19,12 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Air Garrison</forceName>
+		<forceName>Air Garrison</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>5</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>5</startingAltitude>

diff --git a/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml b/MekHQ/data/scenariomodifiers/EnemyAirMobileInf.xml
@@ -38,7 +38,7 @@
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>1</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>None</syncDeploymentType>
 		<useArtillery>false</useArtillery>

diff --git a/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml b/MekHQ/data/scenariomodifiers/EnemyAirPatrol.xml
@@ -26,12 +26,12 @@
 		<fixedUnitCount>2</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Recon Aircraft</forceName>
+		<forceName>Recon Aircraft</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>5</generationOrder>
 		<maxWeightClass>1</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>5</startingAltitude>

diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupport.xml
@@ -26,12 +26,12 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Aircraft</forceName>
+		<forceName>Aircraft</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>5</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>5</startingAltitude>

diff --git a/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml b/MekHQ/data/scenariomodifiers/EnemyAirSupportBombers.xml
@@ -27,12 +27,12 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Aircraft</forceName>
+		<forceName>Aircraft</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>5</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>5</startingAltitude>

diff --git a/MekHQ/data/scenariomodifiers/EnemyArty.xml b/MekHQ/data/scenariomodifiers/EnemyArty.xml
@@ -23,7 +23,7 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Artillery</forceName>
+		<forceName>Artillery</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>3</generationOrder>
 		<maxWeightClass>4</maxWeightClass>

diff --git a/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml b/MekHQ/data/scenariomodifiers/EnemyArtyGarrison.xml
@@ -24,12 +24,12 @@
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Artillery Garrison</forceName>
+		<forceName>Artillery Garrison</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>5</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>

diff --git a/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml b/MekHQ/data/scenariomodifiers/EnemyCommanderMek.xml
@@ -28,10 +28,10 @@
 		<retreatThreshold>75</retreatThreshold>
 		<startingAltitude>0</startingAltitude>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
 	</forceDefinition>
 </AtBScenarioModifier>
diff --git a/MekHQ/data/scenariomodifiers/EnemyDropship.xml b/MekHQ/data/scenariomodifiers/EnemyDropship.xml
@@ -1,5 +1,5 @@
 <AtBScenarioModifier>
-	<additionalBriefingText>An active enemy dropship has been detected in the area.</additionalBriefingText>
+	<additionalBriefingText>An active enemy DropShip has been detected in the area.</additionalBriefingText>
 	<benefitsPlayer>false</benefitsPlayer>
 	<eventTiming>PostForceGeneration</eventTiming>
 	<forceDefinition>
@@ -17,17 +17,26 @@
 		<fixedUnitCount>1</fixedUnitCount>
 		<forceAlignment>2</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Opfor Active Dropship</forceName>
-		<generationMethod>3</generationMethod>
+		<forceName>DropShip</forceName>
+		<generationMethod>2</generationMethod>
 		<generationOrder>3</generationOrder>
 		<maxWeightClass>4</maxWeightClass>
 		<objectiveLinkedForces>
-			<objectiveLinkedForce>Primary Opfor</objectiveLinkedForce>
+			<objectiveLinkedForce>OpFor</objectiveLinkedForce>
 		</objectiveLinkedForces>
 		<retreatThreshold>50</retreatThreshold>
 		<startingAltitude>5</startingAltitude>
 		<syncDeploymentType>SameEdge</syncDeploymentType>
-		<syncedForceName>Primary Opfor</syncedForceName>
+		<syncedForceName>OpFor</syncedForceName>
 		<useArtillery>false</useArtillery>
+        <roleChoices>
+            <forceRole>MEK_CARRIER</forceRole>
+            <forceRole>MEK_CARRIER</forceRole>
+            <forceRole>ASF_CARRIER</forceRole>
+            <forceRole>VEE_CARRIER</forceRole>
+            <forceRole>INFANTRY_CARRIER</forceRole>
+            <forceRole>TROOP_CARRIER</forceRole>
+            <forceRole>CIVILIAN</forceRole>
+        </roleChoices>
 	</forceDefinition>
 </AtBScenarioModifier>