Merge remote-tracking branch 'origin/master'

MegaMek · Jul 27, 2024 · e86f08f · e86f08f
2 parents f6d866a + bc64b24
commit e86f08f
Showing 1 changed file with 0 additions and 28 deletions.
diff --git a/megamek/src/megamek/common/WeaponType.java b/megamek/src/megamek/common/WeaponType.java
@@ -1571,21 +1571,6 @@ public static void initializeTypes() {
         EquipmentType.addType(new InfantryPulseLaserPistolNWW12());
         EquipmentType.addType(new InfantryPulseLaserPistolRDISunSwarmPulsar());
 
-        EquipmentType.addType(new InfantryLaserPistolAA75L());
-        EquipmentType.addType(new InfantryLaserPistolAWAWilibyMk4LaserPistol());
-        EquipmentType.addType(new InfantryLaserPistolBR25());
-        EquipmentType.addType(new InfantryLaserPistolBrightStarL12());
-        EquipmentType.addType(new InfantryLaserPistolBrightStarL15());
-        EquipmentType.addType(new InfantryLaserPistolBrightStarL7());
-        EquipmentType.addType(new InfantryLaserPistolDarklightIVLaserPistol());
-        EquipmentType.addType(new InfantryLaserPistolKelvin000Lancer3MM());
-        EquipmentType.addType(new InfantryLaserPistolXingShan());
-        EquipmentType.addType(new InfantryLaserPistolXingShanER());
-        EquipmentType.addType(new InfantryPulseLaserPistolMedusaIII());
-        EquipmentType.addType(new InfantryPulseLaserPistolMedusaIV());
-        EquipmentType.addType(new InfantryPulseLaserPistolNWW12());
-        EquipmentType.addType(new InfantryPulseLaserPistolRDISunSwarmPulsar());
-
         // Clan Pistols - Commented out can be considered Obsolete
         EquipmentType.addType(new InfantryPistolClanERLaserPistolWeapon());
         EquipmentType.addType(new InfantryPistolClanGaussPistolWeapon());
@@ -1730,19 +1715,6 @@ public static void initializeTypes() {
         EquipmentType.addType(new InfantryPulseLaserRifleGaul());
         EquipmentType.addType(new InfantryPulseLaserRifleTirbuni());
 
-        // Shrapnel Laser Rifles
-        EquipmentType.addType(new InfantryLaserCarbineBrightstarL15());
-        EquipmentType.addType(new InfantryLaserRifleDarkLightCLLight());
-        EquipmentType.addType(new InfantryLaserRifleDWSL5S());
-        EquipmentType.addType(new InfantryLaserRifleScorcherVIBlazerRifle());
-        EquipmentType.addType(new InfantryLaserRifleSyrtisFirebolt12Repaired());
-        EquipmentType.addType(new InfantryLaserRifleSyrtisFirebolt12Unrepaired());
-        EquipmentType.addType(new InfantryLaserRifleWolfBaronSunraker());
-        EquipmentType.addType(new InfantryLaserRifleYangLie());
-        EquipmentType.addType(new InfantryPulseLaserRifleDWSL5C());
-        EquipmentType.addType(new InfantryPulseLaserRifleGaul());
-        EquipmentType.addType(new InfantryPulseLaserRifleTirbuni());
-
         // Shrapnel Sniper Files
         EquipmentType.addType(new InfantrySniperRifleBartonAMRAntiArmor());
         EquipmentType.addType(new InfantrySniperRifleBartonAMRStandard());