diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
index 7b9ac38ba..6dc637aa3 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
@@ -2393,11 +2393,24 @@ Object Boss_PowerPlant
   EnergyBonus      = 5
   VisionRange      = 200.0           ; Shroud clearing distance
   ShroudClearingRange = 200
+
+  ; Patch104p @bugfix - hanfield commy2
+  ; Added new default armorset that cannot be targeted or suffer SUBDUAL damage.
+  ; This resolves the Microwave Tank exploit but does not prevent being properly disabled later.
+  ; 06/08/2022
+
   ArmorSet
-    Conditions     = None
-    Armor          = StructureArmor
-    DamageFX       = StructureDamageFXNoShake
+    Conditions        = None                           ; Default state while being constructed.
+    Armor             = StructureArmor_NoSubdualDamage ; Cannot be targeted by Microwave Tanks.
+    DamageFX          = StructureDamageFXNoShake
+  End
+
+  ArmorSet
+    Conditions        = PLAYER_UPGRADE ; Upgrade is granted immediately once construction is complete.
+    Armor             = StructureArmor ; Can be disabled by Microwave Tanks normally.
+    DamageFX          = StructureDamageFXNoShake
   End
+
   CommandSet       = Boss_AmericaPowerPlantCommandSet
   ExperienceValue     = 100 100 100 100  ; Experience point value at each level
 
@@ -2486,10 +2499,30 @@ Object Boss_PowerPlant
     UpgradedMineName      = ChinaEMPMine
   End
 
-  Behavior = ArmorUpgrade ModuleTag_26
-    TriggeredBy = Upgrade_ChinaEMPMines
+  ; Patch104p @bugfix - hanfield commy2
+  ; Added two extra modules for Microwave Tank bug fix.
+  ;
+  ; MicrowaveTankFix01 grants a dummy object-class upgrade once the building is complete.
+  ; MicrowaveTankFix02 upgrades the armor with said upgrade and allows subdual once again.
+  ;
+  ; 06/08/2022
+
+  Behavior = GrantUpgradeCreate ModuleTag_MicrowaveTankFix01
+    UpgradeToGrant = Upgrade_DummyUpgrade
   End
 
+  Behavior = ArmorUpgrade ModuleTag_MicrowaveTankFix02
+    TriggeredBy = Upgrade_DummyUpgrade
+  End
+
+  ; Patch104p @bugfix - hanfield commy2
+  ; Replaced the ArmorUpgrade that was used to trigger EMP mine availability with WeaponSetUpgrade.
+  ; This allows the player to research EMP mines while permitting the armorset-related bugfix.
+  ; 06/08/2022
+
+  Behavior = WeaponSetUpgrade ModuleTag_NeutronMineDummy
+    TriggeredBy = Upgrade_ChinaEMPMines
+  End
 
   Geometry            = BOX
   GeometryMajorRadius = 22.0