diff --git a/Allied/artmd_allied.ini b/Allied/artmd_allied.ini
index 0ebcb20..8d69393 100644
--- a/Allied/artmd_allied.ini
+++ b/Allied/artmd_allied.ini
@@ -671,6 +671,14 @@ PrimaryFireFLH=225,65,0
 SecondaryFireFLH=0,0,-40
 SecondSpawnOffset=-70,0,0
 
+[XSUB]
+Cameo=BSUBICON
+Voxel=yes
+Remapable=yes
+PrimaryFireFLH=225,65,0
+SecondaryFireFLH=0,0,-40
+SecondSpawnOffset=-70,0,0
+
 [DLPH]	;allied dolphin
 Cameo=DLPHICON
 Voxel=no
diff --git a/Allied/cp_allied.sh b/Allied/cp_allied.sh
index 62fd084..21c2671 100644
--- a/Allied/cp_allied.sh
+++ b/Allied/cp_allied.sh
@@ -2,4 +2,6 @@ sudo cp rulesmd_allied.ini /mnt/c/Program\ Files\ \(x86\)/RA2/rulesmd.ini
 sudo cp artmd_allied.ini /mnt/c/Program\ Files\ \(x86\)/RA2/artmd.ini
 sudo cp schpx.hva /mnt/c/Program\ Files\ \(x86\)/RA2/schpx.hva
 sudo cp schpx.vxl /mnt/c/Program\ Files\ \(x86\)/RA2/schpx.vxl
-sudo cp aimd_allied.ini /mnt/c/Program\ Files\ \(x86\)/RA2/aimd.ini
\ No newline at end of file
+sudo cp aimd_allied.ini /mnt/c/Program\ Files\ \(x86\)/RA2/aimd.ini
+sudo cp xsub.hva /mnt/c/Program\ Files\ \(x86\)/RA2/xsub.hva
+sudo cp xsub.vxl /mnt/c/Program\ Files\ \(x86\)/RA2/xsub.vxl
\ No newline at end of file
diff --git a/Allied/rulesmd_allied.ini b/Allied/rulesmd_allied.ini
index f534e40..07c065a 100644
--- a/Allied/rulesmd_allied.ini
+++ b/Allied/rulesmd_allied.ini
@@ -129,7 +129,7 @@ AIIonCannonBaseDefenseValue=35,35,35
 ; Ion storm control ;gs Now, Weather Control, err... Control
 LightningDeferment=250      ; PCG; Number of frames between announcement of strike and its commencement.
 LightningDamage=500         ; Damage done by lightning strike. ;used to be 250
-LightningStormDuration=1260 ; Default ion storm duration in frames. This is overriden by the trigger control.  ;used to be 420
+LightningStormDuration=2100 ; Default ion storm duration in frames. This is overriden by the trigger control.  ;used to be 420
 LightningWarhead=IonWH      ; Warhead used by ion storm strike.
 LightningHitDelay=10        ; How often the direct target gets hit in frames ;used to be 150
 LightningScatterDelay=1     ; Frame delay between random bolts -- DO NOT DECREASE -- PERFORMANCE HIT ;used to be 14
@@ -138,7 +138,7 @@ LightningSeparation=.5      ; SJM: city-block distance in cells between clouds/b
 IonStorms=no                ; Are random ion storms going to appear?
 
 ;*** ForceShield Control ***
-ForceShieldRadius=4 ;6;10 ;in cells
+ForceShieldRadius=6 ;6;10 ;in cells
 ForceShieldDuration=500 ;300 ;in frames, force field duration
 ForceShieldBlackoutDuration=1000 ;600 ; the fact that this is bigger than the one above is the coolest idea ever
 ForceShieldPlayFadeSoundTime=75 ; when there are this many frames left in the force shield effect, play the ForceShieldFadingSound (must be smaller than ForceShieldDuration)
@@ -239,8 +239,8 @@ ChronoRangeMinimum=0	;this can be used to set a small range within which the del
 ;AmerParaDropInf=E1,GHOST,ENGINEER ;Types of infantry for the planes to drop
 ;AmerParaDropNum=6,6,6 ;How many of each of those infantry
 
-AmerParaDropInf=ENGINEER,GHOST,SPY,PTROOP ;Types of infantry for the planes to drop
-AmerParaDropNum=4,4,4,4 ;How many of each of those infantry
+AmerParaDropInf=ENGINEER,LUNR,CCOMAND,PTROOP,LUNR ;Types of infantry for the planes to drop
+AmerParaDropNum=4,4,4,4,4 ;How many of each of those infantry
 
 AllyParaDropInf=E1 ;Types of infantry for the planes to drop
 AllyParaDropNum=6 ;How many of each of those infantry
@@ -870,7 +870,7 @@ OpenToppedDamageMultiplier=1.2
 OpenToppedWarpDistance=7;Chrono legionairre has to let go if BF moves this far away from target (CL not moving, but is being moved so link won't break on move like normal)
 
 DeathWeapon=DefaultDeathWeapon ;gs Can't use the unit's weapon anymore now that spread is fixed.  Damage will be based on hitpoints
-IronCurtainDuration=3000 ;gs In frames 900 is a minute for 15fps
+IronCurtainDuration=3750 ;gs In frames 900 is a minute for 15fps
 FirestormWarhead=FirestormWH ;	the warhead that the firestorm defense uses when active
 IonCannonWarhead=IonCannonWH ;	the warhead that the ion cannon uses
 VeinholeWarhead=VeinholeWH
@@ -1153,6 +1153,7 @@ Mutant=Special
 83=AMBU
 84=CIVP
 85=SCHPX
+86=XSUB
 
 ; ******* Aircraft Type List *******
 ; This lists all of the aircraft types in the game. Each aircraft
@@ -3040,8 +3041,10 @@ N3W56=YAYARD4
 105=BlimpHEEffect
 106=SCHOPXWH
 107=PsiPulseX
-108=PsiPulseXE
-
+108=APSplashX
+109=HollowPoint5
+110=DiskXWH
+111=SublaserWH
 ; ******* Multiplayer Dialog Settings *******
 ; These are the multiplayer dialog settings. Does not apply to Westwood chat,
 ; only to the in-game dialogs.  Gads what a mess this was!
@@ -3520,7 +3523,7 @@ BuildSlowdown=yes
 [Normal]
 Groundspeed=1.0
 Airspeed=1.0
-BuildTime=1
+BuildTime=.5
 Armor=1.0
 ROF=1.0
 Cost=1.0
@@ -3533,10 +3536,10 @@ ContentScan=yes
 [Difficult]
 Groundspeed=1.0
 Airspeed=1.0
-BuildTime=.25
-Armor=.8
+BuildTime=.1
+Armor=1.0
 ROF=1.2
-Cost=.5
+Cost=.25
 RepairDelay=.05
 BuildDelay=.01
 BuildSlowdown=yes
@@ -3786,6 +3789,7 @@ EliteOccupyWeapon=UCElectricBoltE; The weapon I use while Occupying.  Defaults t
 OpenTransportWeapon=1;defaults to -1 (decide normally)  What weapon should I use in a Battle Fortress
 Prerequisite=GAPILE
 CrushSound=InfantrySquish
+NavalTargeting=5
 Strength=250
 Pip=white
 OccupyPip=PersonBlue
@@ -3916,7 +3920,10 @@ VoiceSpecialAttack=EngAllAttackCommand
 VoiceEnter=EngAllMove
 VoiceCapture=EngAllAttackCommand
 DieSound=EngAllDie
-Locomotor={4A582744-9839-11d1-B709-00A024DDAFD1}
+ChronoInSound=ChronoLegionTeleport
+ChronoOutSound=ChronoLegionTeleport
+Locomotor={4A582747-9839-11d1-B709-00A024DDAFD1}
+;Locomotor={4A582744-9839-11d1-B709-00A024DDAFD1}
 PhysicalSize=1
 MovementZone=Infantry
 ThreatPosed=0	; This value MUST be 0 for all building addons
@@ -3950,6 +3957,7 @@ CrushSound=InfantrySquish
 Strength=200
 Pip=white
 Armor=none
+NavalTargeting=5
 TechLevel=2
 Unnatural=yes
 Sight=6
@@ -4014,6 +4022,7 @@ Pip=white
 Speed=10
 Owner=British,French,Germans,Americans,Alliance
 AllowedToStartInMultiplayer=no
+NavalTargeting=5
 Cost=600
 Soylent=300
 Points=15
@@ -4022,6 +4031,8 @@ VoiceSelect=RocketeerSelect
 VoiceMove=RocketeerMove
 VoiceAttack=RocketeerAttackCommand
 VoiceFeedback=RocketeerFear
+OpportunityFire=yes
+CanPassiveAquire=yes
 VoiceSpecialAttack=RocketeerMove
 DieSound=
 CrashingSound=RocketeerDie
@@ -4090,7 +4101,10 @@ VoiceAttack=SpyAttackCommand
 VoiceFeedback=SpyFear
 VoiceSpecialAttack=SpySpecialAttack
 DieSound=SpyDie
-Locomotor={4A582744-9839-11d1-B709-00A024DDAFD1}
+ChronoInSound=ChronoLegionTeleport
+ChronoOutSound=ChronoLegionTeleport
+Locomotor={4A582747-9839-11d1-B709-00A024DDAFD1}
+;Locomotor={4A582744-9839-11d1-B709-00A024DDAFD1}
 PhysicalSize=1
 MovementZone=Infantry
 ThreatPosed=0	; This value MUST be 0 for all building addons
@@ -4163,6 +4177,8 @@ EliteOccupyWeapon=UCElectricBoltE; The weapon I use while Occupying.  Defaults t
 DetectDisguise=yes
 Parasiteable=no
 Unnatural=yes
+Snesors=yes
+SensorsSight=10
 
 [TANY]
 UIName=Name:TANYA
@@ -4210,7 +4226,6 @@ ImmuneToPsionics=yes
 VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT,SCATTER
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 Size=1
-DetectDisguise=yes
 ElitePrimary=DoublePistolsE
 EliteSecondary=SapperE
 IFVMode=4
@@ -4223,6 +4238,8 @@ EliteOccupyWeapon=UCElectricBoltE; The weapon I use while Occupying.  Defaults t
 DetectDisguise=yes
 Parasiteable=no
 Unnatural=yes
+Sensors=yes
+SensorsSight=10
 
 ; Chrono Legionnaire
 [CLEG]
@@ -4236,6 +4253,7 @@ CrushSound=InfantrySquish
 Crushable=no
 Strength=375
 SelfHealing=yes
+NavalTargeting=5
 Unnatural=yes
 Armor=flak
 TechLevel=10
@@ -4298,7 +4316,8 @@ CrushSound=InfantrySquish
 Crushable=no
 TiberiumProof=yes
 Strength=200
-Armor=none
+Armor=flak
+NavalTargeting=5
 TechLevel=9
 Pip=red
 Sight=8
@@ -4353,12 +4372,13 @@ RequiresStolenThirdTech=yes
 Primary=MindControlX
 Secondary=PsiWaveX
 LeadershipRating=8
+NavalTargeting=5
 ;C4=yes
 CrushSound=InfantrySquish
 Crushable=no
 TiberiumProof=yes
 Strength=200
-Armor=none
+Armor=flak
 TechLevel=9
 Pip=red
 Sight=8
@@ -4392,8 +4412,6 @@ ImmuneToPsionics=yes
 ;Deployer=yes
 ;DeployFire=yes
 ;UndeployDelay=75
-ElitePrimary=MindControlXE
-EliteSecondary=PsiWaveXE
 IFVMode=4
 Trainable=yes
 Occupier=yes
@@ -4417,6 +4435,7 @@ Primary=AWP
 ;CanPassiveAquire=no ; Won't try to pick up own targets
 Prerequisite=GAPILE,GATECH
 CrushSound=InfantrySquish
+NavalTargeting=5
 Strength=375
 Crushable=no
 TiberiumProof=yes
@@ -4860,15 +4879,17 @@ JumpJet=yes
 Primary=Lunarlaser
 Prerequisite=NAPILE,RADAR
 Crushable=yes
-Strength=125
+Strength=250
 Fearless=yes
-Armor=none
+Armor=flak
 TechLevel=11
 Sight=8
 Pip=white
-Speed=9
+Speed=10
 Owner=Russians,Confederation,Africans,Arabs
 AllowedToStartInMultiplayer=no
+OpportunityFire=yes
+CanPassiveAquire=yes
 Cost=600
 Soylent=250
 Points=15
@@ -4903,8 +4924,14 @@ HoverAttack=yes
 Crashable=yes
 BalloonHover=yes ; ie never land
 MoveSound=RocketeerMoveLoop
-ElitePrimary=Lunarlaser
+ElitePrimary=LunarlaserE
 JumpJetTurn=yes ;Use proper turn logic
+ImmuneToPsionics=yes
+ImmuneToVeins=yes
+Unnatural=yes
+Parasiteable=no
+Trainable=yes
+DetectDisguise=yes
 
 ; **************************** Side Specific *******************************
 
@@ -5615,6 +5642,8 @@ Armor=none
 TechLevel=-1
 Crushable=no
 Insignificant=no
+Primary=SublaserFragment
+Secondary=SublaserFragmentE
 ;spit disabled until I get time to make it a lot weaker - DB
 ;Primary=ChimpBite
 ;Secondary=VirtualScanner
@@ -6756,6 +6785,7 @@ Turret=yes
 IsTilter=yes
 Crusher=yes
 TooBigToFitUnderBridge=true
+NavalTargeting=5
 TechLevel=2
 Sight=8
 Speed=8
@@ -6804,6 +6834,7 @@ Prerequisite=GAWEAP
 Primary=HoverMissile
 Strength=400
 Category=Transport
+NavalTargeting=5
 Armor=light
 DeployTime=.022
 TechLevel=3
@@ -6959,6 +6990,7 @@ Name=Mirage Tank
 Image=RTNK
 Prerequisite=GAWEAP,GATECH
 Primary=MirageGun
+NavalTargeting=5
 DisguiseWhenStill=yes;gs I can no longer pick a disguise nor deploy
 ;Primary=TankMakeupKit
 ;Secondary=MirageGun
@@ -7015,6 +7047,7 @@ OpportunityFire=yes
 UIName=Name:SREF
 Name=Prism Tank
 Prerequisite=GAWEAP,GATECH
+NavalTargeting=5
 ; SJM removed; see abusive section below...
 ; Primary=Comet
 ; ElitePrimary=SuperComet ; Elite Weapon
@@ -7078,6 +7111,7 @@ Name=Battle Fortress
 Prerequisite=GAWEAP,GATECH
 Primary=AKM
 Strength=1200
+NavalTargeting=5
 Category=AFV
 Armor=heavy
 IsTilter=yes
@@ -7243,11 +7277,12 @@ Bunkerable=no; Units default to yes, others default to no
 UIName=Name:DEST
 Name=Destroyer
 Prerequisite=GAYARD
-Primary=155mm
-Secondary=ASWLauncher
+Primary=ASWLauncher
+Secondary=BoomerTorpedoX
 NavalTargeting=1
+LandTargeting=0
 Spawns=ASW
-SpawnsNumber=3
+SpawnsNumber=2
 SpawnRegenRate=100
 SpawnReloadRate=40
 NoSpawnAlt=yes ; alternate voxel for out of spawns: xxxxWO (DESTWO)
@@ -7262,8 +7297,8 @@ Sight=7
 Speed=6
 Owner=British,French,Germans,Americans,Alliance
 AllowedToStartInMultiplayer=no
-Cost=1000
-Soylent=1000
+Cost=1200
+Soylent=1200
 Turret=no ; can't have a turrett and a NoSpawnAlt (both go in AuxVoxel)
 Points=30
 ROT=5
@@ -7287,9 +7322,9 @@ VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT,FASTER
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 TooBigToFitUnderBridge=true
 Sensors=yes
-SensorsSight=10
+SensorsSight=15
 OpportunityFire=yes ; since no turret, will only apply to helicopter (since ASWLauncher has OmniFire)
-ElitePrimary=155mmE
+EliteSecondary=BoomerTorpedoXE
 Size=30
 IsSelectableCombatant=yes
 Unnatural=yes
@@ -7297,6 +7332,7 @@ ImmuneToVeins=yes
 ImmuneToPsionics=yes
 Parasiteable=no
 Unnatural=yes
+GuardRange=10
 
 ;Dolphin
 [DLPH]
@@ -7304,9 +7340,10 @@ UIName=Name:DLPH
 Name=Dolphin
 NotHuman=yes
 Prerequisite=GAYARD,GATECH
-Primary=SonicZap
+Primary=MindControlD
+Secondary=PsiWaveX
 NavalTargeting=5
-LandTargeting=1
+LandTargeting=0
 FireAngle=64
 Category=AFV
 Strength=400
@@ -7315,15 +7352,14 @@ Armor=light
 TechLevel=5
 Underwater=yes
 Sight=4
-GuardRange=4
 Sensors=yes
-SensorsSight=8 ;4
+SensorsSight=15 ;4
 Speed=9
 CrateGoodie=no
 Owner=British,French,Germans,Americans,Alliance
 AllowedToStartInMultiplayer=no
-Cost=500
-Soylent=500
+Cost=1500
+Soylent=1500
 Turret=no
 Points=15
 ROT=6
@@ -7345,12 +7381,10 @@ EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 ;TooBigToFitUnderBridge=true
 Cloakable=yes
 CloakingSpeed=1
-TypeImmune=yes
 Organic=yes
 ;NoShadow=yes
 WalkRate=4 ; these two are needed because unit as sprite is terribly hack. Doing units as infantry with DoControls could be considered
 IdleRate=8 ; power of two helps performance (mod).  "How much slower should I animate when stopped? 1/x"
-ElitePrimary=SonicZapE
 Size=15
 IsSelectableCombatant=yes
 ImmuneToVeins=yes
@@ -7358,12 +7392,15 @@ ImmuneToPsionics=yes
 OpportunityFire=yes
 Parasiteable=no
 Unnatural=yes
+Deployer=yes
+DeployFire=yes
+UndeployDelay=75
 
 ; Aegis Cruiser
 [AEGIS]
 UIName=Name:AEGIS
 Name=Aegis Cruiser
-Prerequisite=GAYARD,RADAR
+Prerequisite=GAYARD,GATECH
 Primary=Medusa
 NavalTargeting=5
 ;LandTargeting=0
@@ -7394,7 +7431,7 @@ RadialFireSegments=10
 ;OmniFire=yes ;GEF moved to weapon
 OpportunityFire=yes
 Sensors=yes
-SensorsSight=10
+SensorsSight=21
 ;Reload=60
 ;;Reload=10			; For testing.
 ;EmptyReload=180
@@ -7433,6 +7470,7 @@ UIName=Name:CARRIER
 Name=Aircraft Carrier
 Prerequisite=GAYARD,TECH
 Primary=HornetLauncher
+Secondary=MammothTuskX
 CanPassiveAquire=no ; Won't try to pick up own targets
 Spawns=ORCA
 SpawnsNumber=4
@@ -7476,12 +7514,13 @@ ThreatPosed=25	; This value MUST be 0 for all building addons
 DamageParticleSystems=SparkSys,SmallGreySSys
 VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT,FASTER
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
+EliteSecondary=MammothTuskXE
 TooBigToFitUnderBridge=true
 GuardRange=10
 BuildLimit=1
 Size=50
 Sensors=yes
-SensorsSight=10
+SensorsSight=15
 ImmuneToVeins=yes
 ImmuneToPsionics=yes
 Parasiteable=no
@@ -7621,6 +7660,7 @@ Unnatural=yes
 UIName=Name:Robotank
 Name=Robot Tank
 Image=ROBO
+NavalTargeting=5
 Prerequisite=GAWEAP,GAROBO
 Primary=RobotTankBolt
 Strength=360
@@ -7672,6 +7712,8 @@ Trainable=yes
 BuildTimeMultiplier=1.3
 Parasiteable=no
 Unnatural=yes
+Sensors=yes
+SensorsSight=10
 
 
 ; **************************** Side Specific *******************************
@@ -8327,9 +8369,11 @@ TooBigToFitUnderBridge=true
 UIName=Name:DRED
 Name=Dreadnought
 Primary=DredLauncher
+Secondary=MammothTuskX
 Prerequisite=GAYARD,GATECH
 Spawns=DMISL
 SpawnsNumber=2
+NavalTargeting=5
 SpawnRegenRate=80
 SpawnReloadRate=0 ; missile spawn don't come back
 NoSpawnAlt=yes ; alternate voxel for out of spawns: xxxxWO (DREDWO)
@@ -8370,6 +8414,7 @@ ThreatPosed=25	; This value MUST be 0 for all building addons
 DamageParticleSystems=SparkSys,SmallGreySSys
 VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT,FASTER
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
+EliteSecondary=MammothTuskXE
 ImmuneToVeins=yes
 ImmuneToPsionics=yes
 TooBigToFitUnderBridge=true
@@ -9200,6 +9245,67 @@ SpawnReloadRate=0 ; missile spawn don't come back
 ;NoSpawnAlt=yes ; alternate voxel for out of spawns: xxxxWO (DREDWO)
 Unnatural=yes	; for underwater units this means that they will be punched instead of grabbed by a squid
 
+;X attack sub
+[XSUB]
+UIName=Name:Boomer
+Name=Nuclear Submarine
+;Image=SUB
+Prerequisite=GAYARD
+Primary=Sublaser
+Secondary=MammothTuskX;CruiseMissile
+NavalTargeting=5
+LandTargeting=0
+FireAngle=64
+Category=AFV
+Strength=1200
+Owner=British,French,Germans,Americans,Alliance
+Naval=yes
+Armor=heavy
+TechLevel=2
+Underwater=yes
+Sight=8
+Sensors=yes
+SensorsSight=15
+Speed=6
+CrateGoodie=no
+AllowedToStartInMultiplayer=no
+Cost=1200
+Soylent=1200
+Turret=no
+Points=30
+ROT=4
+Crusher=no;gs yes
+Crewed=no
+Weight=4
+Explosion=TWLT070,S_BANG48,S_BRNL58,S_CLSN58,S_TUMU60
+VoiceSelect=SlySelect
+VoiceMove=SlyMove
+VoiceAttack=SlyAttackCommand
+VoiceSecondaryWeaponAttack=SlyAttackCommand
+VoiceFeedback=SlyFear
+VoiceSpecialAttack=SlyMove
+DieSound=SlyDie
+MoveSound=BoomerMoveStart
+Locomotor={2BEA74E1-7CCA-11d3-BE14-00104B62A16C};{4A582741-9839-11d1-B709-00A024DDAFD1}
+SpeedType=Float
+MovementZone=Water
+ThreatPosed=20	; This value MUST be 0 for all building addons
+Accelerates=true
+Cloakable=yes
+CloakingSpeed=1
+VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT,FASTER
+EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
+TooBigToFitUnderBridge=true
+ElitePrimary=SublaserE
+EliteSecondary=MammothTuskXE
+OpportunityFire=yes
+TypeImmune=yes
+Size=20
+Unnatural=yes	; for underwater units this means that they will be punched instead of grabbed by a squid
+ImmuneToVeins=yes
+ImmuneToPsionics=yes
+Parasiteable=no
+
 ; harvester without back
 [SMON]
 UIName=Name:CMON
@@ -10721,17 +10827,19 @@ UIName=Name:SHAD
 Name=BlackHawk Transport
 ;Prerequisite=GAHPAD
 Prerequisite=GAWEAP
-Primary=BlackHawkCannon
-Strength=262.5
+Primary=AKM
+Strength=1000
 Category=AirPower
 JumpJet=yes
 Armor=light
 TechLevel=7
 Sight=7
 RadarInvisible=yes
+NavalTargeting=5
 Landable=yes
 PipScale=Passengers
 Passengers=10
+OpenTopped=yes
 Speed=15
 PitchSpeed=1.1
 JumpjetSpeed=30 ;params not defined use defaults (old globals way up top)
@@ -10743,7 +10851,7 @@ JumpjetHeight=500
 JumpjetWobbles=.01
 JumpjetDeviation=1
 Owner=British,French,Germans,Americans,Alliance
-Cost=1000
+Cost=2000
 Points=15
 ROT=5
 Crewed=yes
@@ -10773,13 +10881,13 @@ SizeLimit=2
 HoverAttack=yes
 AllowedToStartInMultiplayer=no
 Crashable=yes
-CanPassiveAquire=no
+CanPassiveAquire=yes
 SpeedType=Hover
 MoveSound=BlackOpsMoveLoop
 EnterTransportSound=EnterTransport
 LeaveTransportSound=ExitTransport
-ElitePrimary=BlackHawkCannonE
-PreventAttackMove=yes
+ElitePrimary=AKME
+PreventAttackMove=no
 ;Bombable=no
 TooBigToFitUnderBridge=true
 Trainable=yes
@@ -10855,11 +10963,11 @@ PreventAttackMove=yes
 [ASW]
 UIName=Name:ASW
 Name=Osprey
-Primary=ASWBomb
+Primary=Maverick4
 Secondary=ASWCollision
-NavalTargeting=2
-LandTargeting=1
-Strength=60
+NavalTargeting=5
+LandTargeting=0
+Strength=150
 Category=AirPower
 Armor=light
 Spawned=yes
@@ -10869,8 +10977,7 @@ RadarInvisible=no
 Landable=yes
 MoveToShroud=yes
 ;Dock=GAAIRC,AMRADR
-PipScale=Ammo
-Speed=13
+Speed=17
 PitchSpeed=.9
 PitchAngle=0
 Owner=British,French,Germans,Americans,Alliance
@@ -10897,7 +11004,9 @@ DamageParticleSystems=SparkSys,SmallGreySSys
 AuxSound1=OspreyTakeOff ;Taking off
 AuxSound2=OspreyLanding ;Landing
 ImmuneToPsionics=yes
+ElitePrimary=Maverick4E
 ;Selectable=no	; SJM: this should be here but is commented out because bug prevents aircraft from landing
+Fighter=yes
 
 ; Carrier Fighter
 [HORNET]
@@ -11160,6 +11269,7 @@ Secondary=160mmX
 Strength=450
 Category=AirPower
 JumpJet=yes
+NavalTargeting=5
 Armor=light
 TechLevel=7
 Sight=7
@@ -12343,6 +12453,7 @@ BuildCat=Combat
 Strength=800
 Armor=steel
 Prerequisite=BARRACKS,GACNST
+NavalTargeting=5
 TechLevel=1
 Adjacent=4
 ROT=10
@@ -12378,6 +12489,7 @@ AntiAirValue=0
 VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 Trainable=yes
+ElitePrimary=Vulcan2E
 ;gs these three are in abstract units and just help the AI pick the right base defense. (see AIForcePredictionFudge)
 DetectDisguise=yes
 
@@ -12440,6 +12552,7 @@ DetectDisguise=yes
 [ATESLA]
 UIName=Name:ATESLA
 Name=Allied Prism Cannon
+NavalTargeting=5
 Image=GAPRIS
 BuildCat=Combat
 Prerequisite=POWER,RADAR,GACNST
@@ -12484,6 +12597,7 @@ VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 Trainable=yes
 DetectDisguise=yes
+ElitePrimary=PrismShotE
 
 ; Allied SpySat
 [GASPYSAT]
@@ -12673,6 +12787,7 @@ BuildCat=Combat
 Strength=1800
 Armor=steel
 TechLevel=7
+NavalTargeting=5
 Prerequisite=RADAR,GACNST
 Adjacent=2
 Sight=10
@@ -12714,6 +12829,7 @@ VeteranAbilities=STRONGER,FIREPOWER,ROF,SIGHT
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 Trainable=yes
 DetectDisguise=yes
+ElitePrimary=GrandCannonWeaponE
 
 
 
@@ -22814,6 +22930,18 @@ Report=PillboxAttack
 Anim=MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW
 ; SJM thinks this is silly for a machine gun: Bright=true
 
+; pill box gun
+[Vulcan2E]
+Damage=112.5
+ROF=17.33
+Range=8.25
+Projectile=InvisibleLow
+Speed=100
+Warhead=SA
+Report=PillboxAttack
+Anim=MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW
+; SJM thinks this is silly for a machine gun: Bright=true
+
 ;Rocket Tower Grenade
 [RPGTower]
 Damage=110
@@ -22848,6 +22976,18 @@ Warhead=APSplash2
 DecloakToFire=no
 Burst=2
 
+[BoomerTorpedoX]
+Damage=90
+ROF=80
+Range=8
+Projectile=Torpedo
+Speed=40 ;18
+Report=BoomerAttack2
+Warhead=APSplashX
+DecloakToFire=no
+Burst=2
+OmniFire=yes
+
 ;Bike Missile
 [BikeMissile]
 Damage=40
@@ -22864,7 +23004,18 @@ Damage=112.5
 ROF=36.67
 Range=18
 Projectile=AAHeatSeeker
-Speed=100
+Speed=150
+Warhead=SAMWH
+Report=PatriotAttack
+TurboBoost=yes
+
+;SAM missile
+[RedEye2E]
+Damage=168.8
+ROF=36.67
+Range=18
+Projectile=AAHeatSeeker
+Speed=150
 Warhead=SAMWH
 Report=PatriotAttack
 TurboBoost=yes
@@ -22936,7 +23087,7 @@ MinimumRange=1
 Damage=200
 ROF=30
 Range=18
-Speed=120
+Speed=150
 Projectile=MedusaProjectile
 Warhead=SAMWH
 Report=AegisAttack
@@ -23288,6 +23439,7 @@ Projectile=Invisible3
 Speed=100
 Warhead=SSA
 Report=RocketeerAttack
+OmniFire=yes
 
 [MP5]
 Damage=187.5
@@ -23366,13 +23518,13 @@ ROF=6.67
 Range=7
 Projectile=InvisibleAll
 Speed=100
-Warhead=HollowPoint
+Warhead=HollowPoint5
 Report=SealAttack
 
 [FakeC4]
-Damage=5000
-ROF=10
-Range=1.5
+Damage=9999
+ROF=5
+Range=2.5
 CellRangefinding=yes
 Projectile=InvisibleLow
 Speed=100
@@ -23442,15 +23594,13 @@ Range=8
 Projectile=InvisibleAll
 Speed=40
 Report=FloatingDiscAttack
-Warhead=DiskWH
+Warhead=DiskXWH
 Bright=yes
 ;IsRadBeam=yes
-LaserInnerColor=0,180,216
-LaserOuterColor=0,180,216
+IsHouseColor=true
 LaserOuterSpread=0,0,0
 LaserDuration=15
-;IsLaser=true	; this flag tells the game to use the special laser draw effect
-DiskLaser=yes; new ring draw laser
+IsLaser=true	; this flag tells the game to use the special laser draw effect
 OmniFire=yes
 
 [BlackHawkLaserE]
@@ -23460,15 +23610,12 @@ Range=8
 Projectile=InvisibleAll
 Speed=40
 Report=FloatingDiscAttack
-Warhead=DiskWH
+Warhead=DiskXWH
 Bright=yes
-;IsHouseColor=true
-LaserInnerColor=0,180,216
-LaserOuterColor=0,180,216
+IsHouseColor=true
 LaserOuterSpread=0,0,0
-LaserDuration= 15
-;IsLaser=true	; this flag tells the game to use the special laser draw effect
-DiskLaser=yes; new ring draw laser
+LaserDuration=15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
 OmniFire=yes
 Burst=2
 
@@ -23497,15 +23644,15 @@ Burst=2
 
 ; air-to-surface homing missile (launched from helicopter)
 [Maverick]
-Damage=225
+Damage=200
 ROF=10
 Range=7
 Projectile=AirToGroundMissile ;GEF was AAHeatSeeker2 ; was HeatSeeker
-Speed=35
+Speed=70
 Warhead=NUKE
 Report=IntruderAttack
 Burst=1
-RadLevel=500
+RadLevel=1000
 
 [Maverick2]
 Damage=300
@@ -23526,6 +23673,15 @@ Warhead=MIGWH
 Report=MigAttack
 Burst=2
 
+[Maverick4]
+Damage=150
+ROF=10
+Range=7
+Projectile=AirToGroundMissile ;GEF was AAHeatSeeker2 ; was HeatSeeker
+Speed=70
+Warhead=ORCAAP
+Report=MigAttack
+
 [ParaDropWeapon]	; Dummy weapon, not actually fired.
 Damage=60
 ROF=130
@@ -23598,12 +23754,12 @@ Bright=yes
 CellRangefinding=yes
 
 [ASWCollision] ;A crashing ASW turns into this bullet at the last second
-Damage=200
+Damage=300
 ROF=13.33
 Range=4
 Projectile=AAHeatSeeker2 ; will be ASW shaped bullet
 Speed=30
-Warhead=AP
+Warhead=ORCAAP
 Report=OspreyCollision
 Bright=yes
 
@@ -23793,6 +23949,32 @@ Speed=20
 Warhead=HE
 Burst=2
 Report=ApocalypseAttackAir
+OmniFire=yes
+
+; Vehicle carried anti-tank missile
+[MammothTuskX]
+Damage=50
+ROF=53.33
+Range=10
+Projectile=AAHeatSeeker
+Speed=100
+Warhead=SAMWH
+Burst=2
+Report=ApocalypseAttackAir
+OmniFire=yes
+DecloakToFire=no
+
+; Vehicle carried anti-tank missile
+[MammothTuskXE]
+Damage=50
+ROF=53.33
+Range=10
+Projectile=AAHeatSeeker
+Speed=100
+Warhead=SAMWH
+Burst=4
+Report=ApocalypseAttackAir
+DecloakToFire=no
 
 ; artillery cannon
 [155mm]
@@ -24026,20 +24208,21 @@ OmniFire=yes
 [ASWLauncher]
 Damage=1
 ROF=150
-Range=-2 ; infinite
+Range=30 ; infinite
 Spawner=yes
 Projectile=ASWVirt
 ;AntiUnderwater=yes
 Speed=10
 Warhead=Special
 OmniFire=yes
+DecloakToFire=no
 
 ; Sonic Zap
 [SonicZap]
 Damage=6
 AmbientDamage=15
 ROF=80
-Range=7
+Range=8
 ;Projectile=Null
 Projectile=Sonic
 Speed=100
@@ -24048,6 +24231,7 @@ Report=DolphinAttack
 IsSonic=Yes
 DecloakToFire=no
 OmniFire=yes
+Burst=2
 ;AntiUnderwater=yes
 
 ; repair bot repairing
@@ -24167,6 +24351,21 @@ IsLaser=true	; this flag tells the game to use the special laser draw effect
 IsHouseColor=true
 Report=PrismTowerAttack
 
+[PrismShotE]
+Damage=270
+ROF=30 ;60
+Range=12
+Speed=100
+Projectile=InvisibleHigh
+Warhead=PrismWarhead
+;LaserInnerColor = 216,0,184
+;LaserOuterColor = 80,0,88
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+IsHouseColor=true
+Report=PrismTowerAttack
+
 [Yuribustshot]
 Damage=120
 ROF=45 ;60
@@ -24420,17 +24619,6 @@ Anim=YURICNTL
 FireOnce=yes
 
 [MindControlX]
-Damage=3 ;Number of mind control links
-ROF=100
-Range=8
-Projectile=PsychicControlX
-Speed=100
-Warhead=ControllerBuilding
-;Report=YuriMindControl
-Anim=YURICNTL
-FireOnce=yes
-
-[MindControlXE]
 Damage=5 ;Number of mind control links
 ROF=80
 Range=8
@@ -24441,6 +24629,18 @@ Warhead=ControllerBuilding
 Anim=YURICNTL
 FireOnce=yes
 
+[MindControlD]
+Damage=5 ;Number of mind control links
+ROF=80
+Range=10
+Projectile=InvisibleAll
+Speed=100
+Warhead=ControllerBuilding
+;Report=YuriMindControl
+Anim=YURICNTL
+FireOnce=yes
+DecloakToFire=no
+
 [SuperMindControl]
 Damage=1;Number of mind control links
 ROF=1
@@ -24455,8 +24655,8 @@ FireOnce=yes
 [UltimateMindControl]
 Damage=9999;Number of mind control links
 ROF=1
-Range=40
-Projectile=PsychicControl
+Range=50
+Projectile=PsychicControlX
 Speed=100
 Warhead=ControllerBuilding
 ;Report=YuriMindControl
@@ -24510,18 +24710,7 @@ AreaFire=yes ; just shoot straight at ground under feet
 FireOnce=yes ; Only fire once; don't stay in attack mission
 Report=YuriDeploy
 Anim=RING1
-
-[PsiWaveXE]
-Damage=9999;Needed to be considered offensive unit
-Range=1
-ROF=50 ;200 needs to be closer to animation time (Kills everything anyway)
-Projectile=PsychicX
-Speed=1
-Warhead=PsiPulseXE
-AreaFire=yes ; just shoot straight at ground under feet
-FireOnce=yes ; Only fire once; don't stay in attack mission
-Report=YuriDeploy
-Anim=RING1
+DecloakToFire=no
 
 [SuperPsiWave]
 Damage=250;Needed to be considered offensive unit
@@ -24616,6 +24805,19 @@ Bright=yes
 Warhead=GrandCannonWH
 Anim=GCMUZZLE
 
+[GrandCannonWeaponE]
+Damage=300
+ROF=60
+Range=40
+MinimumRange=3
+Projectile=GrandCannonBall
+Speed=1
+Report=GrandCannonAttack
+Bright=yes
+Warhead=GrandCannonWH
+Anim=GCMUZZLE
+Burst=2
+
 [FlakWeapon]		; This belongs to Flak Cannon
 Damage=40
 ROF=20
@@ -24666,11 +24868,10 @@ Report=FlakTrackAttackGround		; put in new sound for this
 Warhead=FlakTWH
 Anim=GUNFIRE
 
-
 [Lunarlaser]
-Damage=25
-ROF=20
-Range=7
+Damage=37.5
+ROF=13.33
+Range=8
 Projectile=InvisibleAll
 Speed=40
 Report=LaserCosmoAttack
@@ -24680,6 +24881,59 @@ IsHouseColor=true
 LaserOuterSpread= 0,0,0
 LaserDuration = 15
 IsLaser=true	; this flag tells the game to use the special laser draw effect
+OmniFire=yes
+
+
+[LunarlaserE]
+Damage=37.5
+ROF=3.33
+Range=8
+Projectile=InvisibleAll
+Speed=40
+Report=LaserCosmoAttack
+Warhead=LUNARWH
+Bright=yes
+IsHouseColor=true
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+OmniFire=yes
+
+[Sublaser]
+Damage=150
+ROF=60
+Range=8
+Projectile=SublaserP
+Speed=40
+Report=PrismTankAttack
+Warhead=SublaserWH
+Bright=yes
+;LaserInnerColor = 216,0,184
+;LaserOuterColor = 80,0,88
+IsHouseColor=true
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+OmniFire=true
+DecloakToFire=no
+
+[SublaserE]
+Damage=225
+ROF=60
+Range=8
+Projectile=SublaserEP
+Speed=40
+Report=PrismTankAttack
+Warhead=SublaserWH
+Bright=yes
+;LaserInnerColor = 216,0,184
+;LaserOuterColor = 80,0,88
+IsHouseColor=true
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+OmniFire=true
+DecloakToFire=no
 
 [DiskLaser]
 Damage=90
@@ -24731,7 +24985,7 @@ LaserDuration = 15
 IsLaser=true	; this flag tells the game to use the special laser draw effect
 
 [CometFragment]
-Damage=45
+Damage=50
 ROF=80
 Range=4
 Projectile=SmallCometP
@@ -24745,6 +24999,38 @@ LaserOuterSpread= 0,0,0
 LaserDuration = 15
 IsLaser=true	; this flag tells the game to use the special laser draw effect
 
+[SublaserFragment]
+Damage=50
+ROF=80
+Range=5
+Projectile=SmallCometP
+Speed=10
+Warhead=SublaserWH
+Bright=yes
+;LaserInnerColor = 216,0,184
+;LaserOuterColor = 80,0,88
+IsHouseColor=true
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+DecloakToFire=no
+
+[SublaserFragmentE]
+Damage=75
+ROF=80
+Range=5
+Projectile=SmallCometP
+Speed=10
+Warhead=SublaserWH
+Bright=yes
+;LaserInnerColor = 216,0,184
+;LaserOuterColor = 80,0,88
+IsHouseColor=true
+LaserOuterSpread= 0,0,0
+LaserDuration = 15
+IsLaser=true	; this flag tells the game to use the special laser draw effect
+DecloakToFire=no
+
 [TeslaFragment]
 Damage=30
 ROF=80
@@ -25256,6 +25542,7 @@ Projectile=Invisible3
 Speed=100
 Warhead=SSA
 Report=RocketeerAttack
+OmniFire=yes
 
 
 [155mmE]
@@ -25481,11 +25768,10 @@ Speed=20
 Warhead=NUKE
 Report=IntruderAttack
 Burst=1
-RadLevel=1000
-
+RadLevel=2000
 
 [Maverick2E]
-Damage=600
+Damage=300
 ROF=6.67
 Range=10
 Projectile=AirToGroundMissile ;GEF was AAHeatSeeker2 ; was HeatSeeker
@@ -25504,6 +25790,16 @@ Warhead=ORCAAP
 Report=BlackEagleAttack
 Burst=2
 
+[Maverick4E]
+Damage=150
+ROF=10
+Range=9
+Projectile=AirToGroundMissile ;GEF was AAHeatSeeker2 ; was HeatSeeker
+Speed=70
+Warhead=ORCAAP
+Report=BlackEagleAttack
+Burst=2
+
 [HornetBombE]
 Damage=120
 ROF=1.33
@@ -25569,12 +25865,23 @@ Warhead=APSplash2
 DecloakToFire=no
 Burst=4
 
+[BoomerTorpedoXE]
+Damage=90
+ROF=80
+Range=8
+Projectile=Torpedo
+Speed=40
+Report=BoomerAttack2
+Warhead=APSplashX
+DecloakToFire=no
+Burst=4
+OmniFire=yes
 
 [SonicZapE]
 Damage=12
 AmbientDamage=22.5
 ROF=53.33
-Range=7
+Range=8
 ;Projectile=Null
 Projectile=Sonic
 Speed=100
@@ -25582,7 +25889,7 @@ Warhead=SonicWarhead
 Report=DolphinAttack
 IsSonic=Yes
 ;AntiUnderwater=yes
-Burst=2
+Burst=4
 OmniFire=yes
 DecloakToFire=no
 
@@ -25646,7 +25953,7 @@ ROF=6.67
 Range=7
 Projectile=InvisibleAll
 Speed=100
-Warhead=HollowPoint
+Warhead=HollowPoint5
 Report=SealAttack
 
 [ATGUNE]
@@ -25927,6 +26234,9 @@ Image=none
 ;Shadow=no
 ;Proximity=yes
 ;Ranged=yes
+SubjectToCliffs=no
+SubjectToElevation=no
+SubjectToWalls=no
 
 [Psychic]
 Inviso=yes
@@ -25936,6 +26246,9 @@ Image=none
 Inviso=yes
 AA=yes
 Image=none
+SubjectToCliffs=no
+SubjectToElevation=no
+SubjectToWalls=no
 
 ; APC Quad Cannon shells
 [QuadShell]
@@ -26019,10 +26332,10 @@ SubjectToWalls=yes
 
 [ADOGJUMP]
 Image=ADOGP ;Hmm...Requires an Image entry to get at Rotates=.  Violates the same name default rule
-AA=no
+AA=yes
 ;AN=no
 Arm=2
-ROT=10 ;requires to use Rotates
+ROT=5 ;requires to use Rotates
 Shadow=no
 Proximity=yes
 Ranged=yes
@@ -26099,9 +26412,9 @@ Level=yes
 
 ; virtual projectile for destroyer helicoptor attack
 [ASWVirt]
-AG=no
+AG=yes
 ;AS=yes
-AA=no
+;AA=yes
 ;AN=yes
 SubjectToCliffs=no
 SubjectToElevation=no
@@ -26177,7 +26490,7 @@ Shadow=no
 Proximity=yes
 Ranged=yes
 AA=yes
-AG=no
+AG=yes
 ;AN=no
 Image=DRAGON
 ROT=80 ;10
@@ -26373,6 +26686,24 @@ SubjectToCliffs=yes
 SubjectToElevation=no
 SubjectToWalls=no
 
+[SublaserP]
+ShrapnelWeapon=SublaserFragment
+ShrapnelCount=3 ; Means (10 - (Range in cells))
+Inviso=yes
+Image=none
+SubjectToCliffs=no
+SubjectToElevation=no
+SubjectToWalls=no
+
+[SublaserEP]
+ShrapnelWeapon=SublaserFragmentE
+ShrapnelCount=5 ; Means (10 - (Range in cells))
+Inviso=yes
+Image=none
+SubjectToCliffs=no
+SubjectToElevation=no
+SubjectToWalls=no
+
 [SuperSmallCometP]
 ShrapnelWeapon=CometFragment
 ShrapnelCount=3 ; Non neg means absolutely 3
@@ -26936,10 +27267,10 @@ EMEffect=yes
 ; warhead for the sonic zap
 [SonicWarhead]
 ;Spread=2
-CellSpread=.1
+CellSpread=.3
 PercentAtMax=1
 Wood=yes
-Verses=100%,100%,100%,100%,80%,80%,100%,60%,60%,100%,100%
+Verses=100%,100%,100%,100%,100%,100%,100%,60%,60%,100%,100%
 ;Verses=100%,100%,80%,40%,60%
 InfDeath=3
 Rocker=yes
@@ -27293,7 +27624,7 @@ ProneDamage=50%
 [SCHOPXWH]
 ;Spread=6
 InfDeath=4
-CellSpread=1.5
+CellSpread=2
 PercentAtMax=.75
 Wall=yes
 Wood=yes
@@ -27311,8 +27642,8 @@ ProneDamage=50%
 [IonWH]
 Wall=yes
 Wood=yes
-CellSpread=2.0
-PercentAtMax=.5
+CellSpread=4
+PercentAtMax=1
 Verses=100%,100%,100%,100%,100%,100%,100%,100%,2%,100%,100%
 ;;Verses=100%,100%,100%,100%,100%,100%,100%,100%,3%,100%,100%
 Conventional=yes
@@ -27411,6 +27742,18 @@ InfDeath=3
 AnimList=S_CLSN16,S_CLSN22,S_CLSN30,S_CLSN42,S_CLSN58
 ProneDamage=50%
 
+; Torp Weapon 2
+[APSplashX]; for units whose missiles are having trouble hitting
+CellSpread=1.5
+PercentAtMax=1
+Wall=yes
+Wood=yes
+Verses=100%,100%,100%,100%,100%,100%,65%,65%,60%,25%,100%
+Conventional=yes
+InfDeath=3
+AnimList=S_CLSN16,S_CLSN22,S_CLSN30,S_CLSN42,S_CLSN58
+ProneDamage=50%
+
 ; armor piercing (discarding sabot, narrow effect)
 [UltraAP]
 ;CellSpread=0
@@ -27487,7 +27830,7 @@ ProneDamage=50%
 ;Chrono commando's fake C4
 [FakeC4WH]
 CellSpread=0
-Verses=0%,0%,0%,0%,0%,0%,100%,100%,100%,0%,100%
+Verses=0%,0%,0%,0%,0%,0%,100%,100%,100%,0%,0%
 
 [HollowPointNoBuilding]
 Verses=200%,100%,100%,1%,1%,1%,1%,1%,1%,1%,100% ; see note in comments above about 1%
@@ -27617,6 +27960,13 @@ AnimList=PIFF
 ProneDamage=100%
 Bullets=yes
 
+[HollowPoint5]
+Verses=100%,100%,100%,40%,40%,40%,0%,0%,0%,40%,100%
+InfDeath=1
+AnimList=PIFF
+ProneDamage=100%
+Bullets=yes
+
 ; anti-infantry rifle bullet (single shot -- very effective verses infantry)
 [Virus]
 Verses=100%,100%,100%,1%,1%,1%,1%,1%,1%,1%,100% ; see note in comments above about 1%
@@ -27681,6 +28031,8 @@ InfDeath=1
 Rocker=yes
 
 [ParasiteDogNoBuilding];Woof woof
+CellSpread=0.75
+PercentAtMax=1
 Verses=100%,100%,100%,100%,100%,100%,0%,0%,0%,100%,100%
 Parasite=yes
 InfDeath=1
@@ -27716,22 +28068,13 @@ InfDeath=6
 PsychicDamage=yes ;gs psychic, but not mind control
 
 [PsiPulseX]
-CellSpread=5 ; gs moved a designer fix from the weapon because it was put in the old WideAreaDamage way instead of the new damage way.  This number used to be 3
+CellSpread=6 ; gs moved a designer fix from the weapon because it was put in the old WideAreaDamage way instead of the new damage way.  This number used to be 3
 PercentAtMax=1
 Verses=100%,100%,100%,100%,100%,100%,0%,0%,0%,100%,100%
 InfDeath=6
 PsychicDamage=yes ;gs psychic, but not mind control
 AffectsAllies=no; Defaults to yes.
 
-[PsiPulseXE]
-CellSpread=7 ; gs moved a designer fix from the weapon because it was put in the old WideAreaDamage way instead of the new damage way.  This number used to be 3
-PercentAtMax=1
-Verses=100%,100%,100%,100%,100%,100%,0%,0%,0%,100%,100%
-InfDeath=6
-PsychicDamage=yes ;gs psychic, but not mind control
-AffectsAllies=no; Defaults to yes.
-
-
 [SuperPsiPulse]
 CellSpread=5
 PercentAtMax=.85
@@ -27786,7 +28129,7 @@ CellSpread=10
 PercentAtMax=1 ;used to be .8
 WallAbsoluteDestroyer=yes
 Wood=yes
-Verses=100%,100%,100%,200%,100%,100%,60%,100%,8%,100%,100%
+Verses=200%,200%,200%,200%,200%,200%,100%,100%,10%,100%,100%
 InfDeath=7; 
 Sparky=no
 Tiberium=yes
@@ -27979,7 +28322,7 @@ Sparky=no
 [SAMWH]
 CellSpread=2
 PercentAtMax=1
-Verses=75%,75%,75%,200%,100%,100%,40%,40%,15%,100%,100%
+Verses=75%,75%,75%,200%,100%,100%,40%,40%,40%,100%,100%
 InfDeath=3
 AnimList=XGRYSML1,XGRYSML2,EXPLOSML
 ProneDamage=100%
@@ -27988,8 +28331,8 @@ ProneDamage=100%
 [ORCAAP]
 Wall=yes
 Wood=yes
-CellSpread=.4
-PercentAtMax=1
+CellSpread=1.5
+PercentAtMax=.8
 Verses=100%,100%,100%,100%,100%,100%,100%,100%,75%,100%,100%
 Conventional=yes
 InfDeath=3
@@ -28038,8 +28381,8 @@ MakesDisguise=yes
 
 ; will need to be balanced in the second pass.
 [GrandCannonWH]
-CellSpread=3
-PercentAtMax=.5
+CellSpread=2.5
+PercentAtMax=.8
 Wall=yes
 Wood=yes
 Sparky=no
@@ -28081,6 +28424,11 @@ Wall=no
 Verses=100%,100%,100%,75%,50%,50%,200%,200%,200%,100%,100%
 AnimList=XGRYSML1,XGRYSML2,EXPLOSML,XGRYMED1,XGRYMED2,EXPLOMED,EXPLOLRG,TWLT070
 
+[SublaserWH]
+Wall=no
+Verses=100%,100%,100%,100%,100%,100%,40%,40%,40%,100%,100%
+AnimList=XGRYSML1,XGRYSML2,EXPLOSML,XGRYMED1,XGRYMED2,EXPLOMED,EXPLOLRG,TWLT070
+
 [DiskWH]
 Wall=no
 Verses=100%,100%,100%,50%,50%,50%,100%,100%,100%,100%,100%
@@ -28088,7 +28436,18 @@ AnimList=XGRYSML1,XGRYSML2,EXPLOSML,XGRYMED1,XGRYMED2,EXPLOMED,EXPLOLRG,TWLT070
 InfDeath=7
 PenetratesBunker=yes;If shot at a bunkered tank, no means the bunker gets the damage, yes means the unit does
 
+[DiskXWH]
+CellSpread=1
+PercentAtMax=.75
+Wall=no
+Verses=100%,100%,100%,50%,50%,50%,100%,100%,100%,100%,100%
+AnimList=XGRYSML1,XGRYSML2,EXPLOSML,XGRYMED1,XGRYMED2,EXPLOMED,EXPLOLRG,TWLT070
+InfDeath=5
+PenetratesBunker=yes;If shot at a bunkered tank, no means the bunker gets the damage, yes means the unit does
+
 [LUNARWH]
+CellSpread=1
+PercentAtMax=.75
 Wall=no
 Verses=100%,100%,100%,75%,50%,50%,100%,100%,100%,100%,100%
 AnimList=XGRYSML1,XGRYSML2,EXPLOSML,XGRYMED1,XGRYMED2,EXPLOMED,EXPLOLRG,TWLT070
@@ -28135,7 +28494,7 @@ Bullets=yes
 ProneDamage=80%
 
 [BORISWH]
-Verses=200%,200%,100%,50%,50%,50%,15%,15%,15%,100%,100%
+Verses=200%,200%,200%,60%,60%,60%,30%,30%,30%,100%,100%
 InfDeath=1
 AnimList=PIFFPIFF,PIFFPIFF
 Bullets=yes
@@ -31375,7 +31734,7 @@ WeaponType=NukeCarrier
 ShowTimer=yes
 DisableableFromShell=yes ; gs this determines which superweapons are turned off by the checkbox
 AIDefendAgainst=yes;AI will use AISuperDefense system to decide to block this
-Range=15
+Range=10
 LineMultiplier=2
 
 ;[EMPulseSpecial]
@@ -31450,7 +31809,7 @@ DisableableFromShell=yes
 SpecialSound=ForceShieldFading;gs wildcard sound hook.  In this case, play at ForceShieldDuration - ForceShieldPlayFadeSoundTime after firing
 StartSound=ForceShieldStarting;gs no anim to hook this on to, so hook it here.
 FlashSidebarTabFrames=120; default is always, put 0 for never, or a number for x
-Range=3.4
+Range=6
 LineMultiplier=3
 
 [LightningStormSpecial]
@@ -31468,7 +31827,7 @@ SidebarImage=BOLTICON
 ShowTimer=yes
 DisableableFromShell=yes ; gs this determines which superweapons are turned off by the checkbox
 AIDefendAgainst=yes;AI will use AISuperDefense system to decide to block this
-Range=20
+Range=10
 LineMultiplier=2
 
 [ChronoSphereSpecial]
@@ -31551,7 +31910,7 @@ Action=PsychicDominator
 SidebarImage=PDOMICON
 ShowTimer=yes
 DisableableFromShell=yes ; gs this determines which superweapons are turned off by the checkbox
-Range=15
+Range=10
 LineMultiplier=3
 
 [SpyPlaneSpecial]
@@ -31584,7 +31943,7 @@ Action=GeneticConverter
 SidebarImage=MUTEICON
 ShowTimer=yes
 DisableableFromShell=yes ; gs this determines which superweapons are turned off by the checkbox
-Range=15
+Range=10
 LineMultiplier=3
 
 [PsychicRevealSpecial]
diff --git a/Allied/xsub.hva b/Allied/xsub.hva
new file mode 100644
index 0000000..0ee9108
Binary files /dev/null and b/Allied/xsub.hva differ
diff --git a/Allied/xsub.vxl b/Allied/xsub.vxl
new file mode 100644
index 0000000..32c01c9
Binary files /dev/null and b/Allied/xsub.vxl differ