diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 4c095f5d0..7264a3728 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -33093,6 +33093,9 @@
         <On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="Create"/>
         <On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
         <On Terms="Behavior.AP_CorsairPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="Create"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.On" Send="Create"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.On" Send="StatusIncrement ActiveCount"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 80e90ba85..8aba4d732 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -45,6 +45,14 @@
             <StateFlags index="Cloak" value="1"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_DisruptorPermanentCloak">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_HaveDisruptorPermanentCloak"/>
+        <Modification>
+            <StateFlags index="Cloak" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_GhostPermanentCloak">
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 11e659919..5bf2fed47 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -7,6 +7,11 @@
     <CButton id="AP_AcidExplosionImmunity">
         <Icon value="Assets\Textures\btn-upgrade-terran-acidexplosionimmunity.dds"/>
     </CButton>
+    <CButton id="AP_PermanentlyCloakedDisruptor">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="Attack">
         <!-- Override -->
         <SimpleDisplayText value=""/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 8522b7cdf..c1e2851db 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -58,6 +58,10 @@
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_NotCountUpgradeHotSHaveSwarmHostSplitACompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDisruptorPermanentCloak">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAP_DisruptorPermanentCloakCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_UseCombatShield">
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCombatShieldCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 5469f538f..99092636d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6202,4 +6202,8 @@
     <CRequirementCountUpgrade id="AP_CountUpgradeAP_RoachVileCompleteOnlyTechTreeCheat">
         <Count Link="AP_RoachVile" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAP_DisruptorPermanentCloakCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_DisruptorPermanentCloak" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 7dfd84132..87cf5074f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15790,6 +15790,7 @@
         <AbilArray Link="AP_PurificationNovaTargeted"/>
         <AbilArray Link="ProgressRally"/>
         <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <BehaviorArray Link="AP_DisruptorPermanentCloak"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
@@ -15799,6 +15800,7 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_PurificationNovaTargeted" Type="AbilCmd" AbilCmd="AP_PurificationNovaTargeted,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_PermanentlyCloakedDisruptor" Type="Passive" Requirements="AP_HaveDisruptorPermanentCloak" Row="1" Column="0"/>
         </CardLayouts>
         <SeparationRadius value="0.375"/>
         <InnerRadius value="0.5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 574414dd9..63cba4475 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -8986,6 +8986,11 @@
         <EffectArray Operation="Set" Reference="Behavior,AP_SpawnLarva,InfoArray[0].MaxCount" Value="6"/>
         <EditorCategories value="Race:Zerg"/>
     </CUpgrade>
+    <CUpgrade id="AP_DisruptorPermanentCloak">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
     <CUpgrade id="AP_K5Apocalypse">
         <EditorCategories value="Race:Zerg,UpgradeType:Talents"/>
     </CUpgrade>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 6051da3cf..483befb8c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -21,6 +21,10 @@
         <Find value="1"/>
         <Value value="AP_HavePermanentCloakWraith"/>
     </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveDisruptorPermanentCloak">
+        <Find value="1"/>
+        <Value value="AP_HaveDisruptorPermanentCloak"/>
+    </CValidatorPlayerRequirement>
     <CValidatorPlayerRequirement id="AP_HaveHotSHaveRaptor">
         <Find value="1"/>
         <Value value="AP_HaveHotSHaveRaptor"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 562974907..919ab66dd 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1377,6 +1377,7 @@ Button/Name/AP_PermanentCloakBanshee=Advanced Cross-Spectrum Dampeners
 Button/Name/AP_PermanentCloakWraith=Unregistered Cloaking System
 Button/Name/AP_PermanentlyCloaked=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedCorsair=Stealth Drive
+Button/Name/AP_PermanentlyCloakedDisruptor=Cloaking Module
 Button/Name/AP_PermanentlyCloakedGhost=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedNova=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedObserver=Permanently Cloaked
@@ -2539,6 +2540,7 @@ Button/Tooltip/AP_PermanentCloakBanshee=Banshee is permanently cloaked.
 Button/Tooltip/AP_PermanentCloakWraith=Wraith is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloaked=This unit is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedCorsair=Corsair is permanently cloaked.
+Button/Tooltip/AP_PermanentlyCloakedDisruptor=Disruptor is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedGhost=Ghost is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedNova=Nova is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedObserver=The Observer is permanently cloaked.