Actually, just move Psycho Shift's mechanics to onHit entirely.
Actually, just move Psycho Shift's mechanics to onHit entirely.

TheManwithskills/Server-2,TheManwithskills/DS,abrulochp/Dropp-Pokemon-Showdown,hayleysworld/Showdown-Boilerplate,AWailOfATail/awoat,CorruptedHelix/Pokemon-Showdown,Kill-The-Noise/BlakJack-Boilerplate,Alpha-Devs/OmegaRuby-Server,Pikachuun/Pokemon-Showdown,TheFenderStory/Pokemon-Showdown,SkyeTheFemaleSylveon/Mudkip-Server,BuzzyOG/Pokemon-Showdown,asdfghjklohhnhn/Pokemon-Showdown,Alpha-Devs/Alpha-Server,Ridukuo/Test,AnaRitaTorres/Pokemon-Showdown,LightningStormServer/Lightning-Storm,Disaster-Area/Pokemon-Showdown,scotchkorean27/Pokemon-Showdown,KewlStatics/Shit,forbiddennightmare/Pokemon-Showdown-1,hayleysworld/Pokemon-Showdown,KewlStatics/Showdown-Template,TogeSR/Lumen-Pokemon-Showdown,KewlStatics/Alliance,yashagl/pokecommunity,Zarel/Pokemon-Showdown,Enigami/Pokemon-Showdown,Darkshadow6/PokeMoon-Creation,Wando94/Spite,AbsolitoSweep/Absol-server,TbirdClanWish/Pokemon-Showdown,Flareninja/Hispano-Pokemon-Showdown,sama2/Universe-Pokemon-Showdown,SkyeTheFemaleSylveon/Mudkip-Server,KewlStatics/Showdown-Template,catanatron/pokemon-rebalance,Flareninja/Showdown-Boilerplate,MayukhKundu/Technogear-Final,Irraquated/Showdown-Boilerplate,TheFenderStory/Showdown-Boilerplate,hayleysworld/asdfasdf,Flareninja/Sora,xCrystal/Pokemon-Showdown,lFernanl/Pokemon-Showdown,gustavo515/test,Adithya4Uberz/KTN,Ecuacion/Pokemon-Showdown,Irraquated/EOS-Master,Extradeath/psserver,ScottehMax/Pokemon-Showdown,abrulochp/Lumen-Pokemon-Showdown,SerperiorBae/PokemonShowdown2,Kokonoe-san/Glacia-PS,Extradeath/advanced,Werfin96/Ultimate,hayleysworld/serenityc9,gustavo515/final,zczd/enculer,TheDiabolicGift/Showdown-Boilerplate,Neosweiss/Pokemon-Showdown,Hidden-Mia/Roleplay-PS,danpantry/Pokemon-Showdown,panpawn/Pokemon-Showdown,DarkSuicune/Pokemon-Showdown,Kokonoe-san/Glacia-PS,MayukhKundu/Technogear,xfix/Pokemon-Showdown,AWailOfATail/Pokemon-Showdown,sama2/Lumen-Pokemon-Showdown,Chespin14/Custom-Platform-Pokemon-Showdown,Sora-Server/Sora,CharizardtheFireMage/Showdown-Boilerplate,CrestfallPS/Pokemon-Showdown,TheManwithskills/Dusk--Showdown,anubhabsen/Pokemon-Showdown,TheManwithskills/Creature-phil-boiler,TheManwithskills/serenity,k3naan/Pokemon-Showdown,urkerab/Pokemon-Showdown,SerperiorBae/Bae-Showdown-2,ZeroParadox/ugh,KewlStatics/Pokeindia-Codes,gustavo515/batata,TheManwithskills/serenity,zek7rom/SpacialGaze,Ecuacion/Pokemon-Showdown,Arcticblast/Pokemon-Showdown,kubetz/Pokemon-Showdown,MasterFloat/Pokemon-Showdown,lFernanl/Lumen-Pokemon-Showdown,danpantry/Pokemon-Showdown,SerperiorBae/BaeShowdown,Firestatics/omega,DesoGit/TsunamiPS,abrulochp/Lumen-Pokemon-Showdown,DalleTest/Pokemon-Showdown,megaslowbro1/Pokemon-Showdown-Server-for-megaslowbro1,Wando94/Pokemon-Showdown,EienSeiryuu/Pokemon-Showdown,Enigami/Pokemon-Showdown,UniversalMan12/Universe-Server,Oiawesome/DPPtServ2,Stroke123/POKEMON,KaitoV4X/Showdown,Ransei1/Alt,MayukhKundu/Pokemon-Domain,Johto-Serverr/Werfin-Boilerplate,Stroke123/POKEMON,johtooo/PS,TheDiabolicGift/Lumen-Pokemon-Showdown,hayleysworld/serenityserver,Wando94/Pokemon-Showdown,Irraquated/EOS-Master,gustavo515/final,SilverTactic/Dragotica-Pokemon-Showdown,TheManwithskills/Server-2,ehk12/coregit,megaslowbro1/Pokemon-Showdown,psnsVGC/Wish-Server,AvinashSwaminathan/Pokelegends,Sora-League/Sora,SolarisFox/Pokemon-Showdown,abulechu/Dropp-Pokemon-Showdown,Checkinator/Pokemon-Showdown,abulechu/Lumen-Pokemon-Showdown,EienSeiryuu/Pokemon-Showdown,lFernanl/Pokemon-Showdown,Breakfastqueen/advanced,Articuno-I/Pokemon-Showdown,FakeSloth/Infinite,PrimalGallade45/Lumen-Pokemon-Showdown,svivian/Pokemon-Showdown,AustinXII/Pokemon-Showdown,Firestatics/Omega-Alpha,svivian/Pokemon-Showdown,urkerab/Pokemon-Showdown,hayleysworld/harmonia,SerperiorBae/Pokemon-Showdown,yashagl/pokemon,AvinashSwaminathan/lotus,ShowdownHelper/Saffron,Atwar/http-server-femalehq.rhcloud.com-80.psim.us-,Zarel/Pokemon-Showdown,xfix/Pokemon-Showdown,gustavo515/gashoro,Lord-Haji/SpacialGaze,k3naan/Pokemon-Showdown,MasterFloat/LQP-Server-Showdown,RustServer/Pokemon-Showdown,MayukhKundu/Pokemon-Domain,Flareninja/Pokemon-Showdown-1,Guernouille/Pokemon-Showdown,Adithya4Uberz/The-Tsunami-League,aakashrajput/Pokemon-Showdown,MasterFloat/LQP-Server-Showdown,Sora-Server/Sora,Pikachuun/Joimmon-Showdown,comedianchameleon/servertest1,svivian/Pokemon-Showdown,Flareninja/Pokemon-Showdown,JellalTheMage/PS-,Yggdrasil-League/Yggdrasil,MeliodasBH/boarhat,SilverTactic/Showdown-Boilerplate,AvinashSwaminathan/lotus-v2,DarkSuicune/Kakuja-2.0,Psyientist/Showdown-Boilerplate,MayukhKundu/Technogear,Flareninja/Pokemon-Showdown,DesoGit/Tsunami_PS,lFernanl/Zero-Pokemon-Showdown,asdfghjklohhnhn/Pokemon-Showdown,Extradeath/advanced,CreaturePhil/Pokemon-Showdown,ehk12/coregit,Alpha-Devs/Alpha-Server,EmmaKitty/Pokemon-Showdown,Git-Worm/City-PS,kuroscafe/Paradox,Git-Worm/City-PS,SerperiorBae/Bae-Showdown,Darkshadow6/PokeMoon-Creation,comedianchameleon/test,Gold-Solox/Pokemon-Showdown,xfix/Pokemon-Showdown,Psyientist/Showdown-Boilerplate,Breakfastqueen/advanced,MeliodasBH/Articuno-Land,catanatron/pokemon-rebalance,TheDiabolicGift/Lumen-Pokemon-Showdown,Atwar/server-epilogueleague.rhcloud.com,Darkshadow6/PokeMoon-Creation,Wando94/Spite,comedianchameleon/servertest1,Legendaryhades/Oblivion,PauLucario/LQP-Server-Showdown,sama2/Lumen-Pokemon-Showdown,cadaeic/Pokemon-Showdown,SerperiorBae/Pokemon-Showdown-1,jd4564/Pokemon-Showdown,panpawn/Gold-Server,Atwar/ServerClassroom,QuiteQuiet/Pokemon-Showdown,TbirdClanWish/Pokemon-Showdown,Atwar/ServerClassroom,HoeenCoder/SpacialGaze,CorruptedHelix/Pokemon-Showdown,Pikachuun/Joimmon-Showdown,Zarel/Pokemon-Showdown,lAlejandro22/lolipoop,AustinXII/Pokemon-Showdown,zczd/enculer,Pikachuun/Pokemon-Showdown-SMCMDM,Syurra/Pokemon-Showdown,PrimalGallade45/Lumen-Pokemon-Showdown,lFernanl/Lumen-Pokemon-Showdown,sirDonovan/Pokemon-Showdown,HoeenCoder/SpacialGaze,lFernanl/Mudkip-Server,ZestOfLife/FestiveLife,ehk12/clone,Lord-Haji/SpacialGaze,CreaturePhil/Pokemon-Showdown,JellalTheMage/Jellals-Server,HoeenKid/Pokemon-Showdown-Johto,TheManwithskills/COC,theodelhay/test,Bryan-0/Pokemon-Showdown,JennyPRO/Jenny,Atwar/server-epilogueleague.rhcloud.com,yashagl/pokemon,SerperiorBae/Pokemon-Showdown-1,urkerab/Pokemon-Showdown,abulechu/Dropp-Pokemon-Showdown,SerperiorBae/Pokemon-Showdown,forbiddennightmare/Pokemon-Showdown-1,Firestatics/Omega-Alpha,PauLucario/LQP-Server-Showdown,Pablo000/aaa,LustyAsh/EOS-Master,AbsolitoSweep/Absol-server,Kenny-/Pokemon-Showdown,bai2/Dropp,SilverTactic/Showdown-Boilerplate,Yggdrasil-League/Yggdrasil,KewlStatics/Shit,TogeSR/Lumen-Pokemon-Showdown,TheManwithskills/Server,AWailOfATail/awoat,arkanox/MistShowdown,azum4roll/Pokemon-Showdown,Flareninja/Pokemon-Showdown-1,InvalidDN/Pokemon-Showdown,sama2/Dropp-Pokemon-Showdown,Volcos/SpacialGaze,xfix/Pokemon-Showdown,kuroscafe/Showdown-Boilerplate,ScottehMax/Pokemon-Showdown,Pablo000/aaa,DesoGit/TsunamiPS,cadaeic/Pokemon-Showdown,SerperiorBae/Bae-Showdown-2,sirDonovan/Pokemon-Showdown,yashagl/pokecommunity,QuiteQuiet/Pokemon-Showdown,NoahVSGamingYT/Pokemon-Showdown,Parukia/Pokemon-Showdown,Kevinxzllz/PS-Openshift-Server,QuiteQuiet/Pokemon-Showdown,Fusxfaranto/Pokemon-Showdown,Evil-kun/Pokemon-Showdown,TheManwithskills/Server-2,Sora-League/Sora,ZeroParadox/ugh,Nineage/Origin,TheManwithskills/New-boiler-test,Volcos/SpacialGaze,hayleysworld/serenity,TheManwithskills/New-boiler-test,panpawn/Pokemon-Showdown,BlazingAura/Showdown-Boilerplate,Sora-Server/Sora,LegendBorned/PS-Boilerplate,JellalTheMage/PS-,ehk12/bigbangtempclone,piiiikachuuu/Pokemon-Showdown,Mystifi/Exiled,BasedGod7/PH,RustServer/Pokemon-Showdown,DalleTest/Pokemon-Showdown,megaslowbro1/Pokemon-Showdown,arkanox/MistShowdown,miahjennatills/Pokemon-Showdown,CreaturePhil/Showdown-Boilerplate,SerperiorBae/PokemonShowdown2,Breakfastqueen/advanced,VoltStorm/Server-pokemon-showdown,kuroscafe/Paradox,Ridukuo/Test2,Flareninja/Hispano-Pokemon-Showdown,Darkshadow6/git-remote-add-scalingo-git-scalingo.com-pokemoonforums,Alpha-Devs/OmegaRuby-Server,KewlStatics/Pokeindia-Codes,megaslowbro1/Showdown-Server-again,kotarou3/Krister-Pokemon-Showdown,SkyeTheFemaleSylveon/Pokemon-Showdown,PrimalGallade45/Dropp-Pokemon-Showdown,Darkshadow6/git-remote-add-scalingo-git-scalingo.com-pokemoonforums,AnaRitaTorres/Pokemon-Showdown,JennyPRO/Jenny,NoahVSGamingYT/Pokemon-Showdown,SerperiorBae/Pokemon-Showdown-1,TheManwithskills/Dusk--Showdown,yashagl/yash-showdown,TheManwithskills/Creature-phil-boiler,DB898/theregalias,Luobata/Pokemon-Showdown,InvalidDN/Pokemon-Showdown,MeliodasBH/Articuno-Land,Thiediev/Pokemon-Showdown,Firestatics/omega,Celecitia/Plux-Pokemon-Showdown,TheManwithskills/DS,Zipzapadam/Server,lAlejandro22/lolipoop,SSJGVegito007/Vegito-s-Server,UniversalMan12/Universe-Server,hayleysworld/Pokemon-Showdown,MayukhKundu/Flame-Savior,Parukia/Pokemon-Showdown,Flareninja/Lumen-Pokemon-Showdown,Kill-The-Noise/BlakJack-Boilerplate,Hopenub/Pokemon-Showdown,Ridukuo/Test,abrulochp/Dropp-Pokemon-Showdown,JellalTheMage/Jellals-Server,Firestatics/Firestatics46,Neosweiss/Pokemon-Showdown,Vacate/Pokemon-Showdown,yashagl/pokemon-showdown,FakeSloth/wulu,Tesarand/Pokemon-Showdown,CharizardtheFireMage/Showdown-Boilerplate,TheManwithskills/Server---Thermal,sama2/Universe-Pokemon-Showdown,SSJGVegito007/Vegito-s-Server,Disaster-Area/Pokemon-Showdown,TheFenderStory/Pokemon-Showdown,LightningStormServer/Lightning-Storm,xfix/Pokemon-Showdown,svivian/Pokemon-Showdown,kupochu/Pokemon-Showdown,Flareninja/Sora,javi501/Lumen-Pokemon-Showdown,HoeenCoder/SpacialGaze,kuroscafe/Showdown-Boilerplate,BlazingAura/Showdown-Boilerplate,Flareninja/Lumen-Pokemon-Showdown,TheManwithskills/Server,abulechu/Lumen-Pokemon-Showdown,DarkSuicune/Pokemon-Showdown,Evil-kun/Pokemon-Showdown,Pikachuun/Pokemon-Showdown-SMCMDM,aakashrajput/Pokemon-Showdown,HoeenCoder/SpacialGaze,ZeroParadox/BlastBurners,kubetz/Pokemon-Showdown,gustavo515/gashoro,DB898/theregalias,hayleysworld/Showdown-Boilerplate,Mystifi/Exiled,SerperiorBae/Pokemon-Showdown,Syurra/Pokemon-Showdown,BuzzyOG/Pokemon-Showdown,psnsVGC/Wish-Server,jumbowhales/Pokemon-Showdown,yashagl/yash-showdown,megaslowbro1/Showdown-Server-again,TheManwithskills/COC,Pikachuun/Touhoumon-Showdown,CreaturePhil/Showdown-Boilerplate,Gold-Solox/Pokemon-Showdown,Nineage/Showdown-Boilerplate,AvinashSwaminathan/lotus-v3,Tesarand/Pokemon-Showdown,Raina4uberz/Light-server,iFaZe/SilverZ,zek7rom/SpacialGaze,Kevinxzllz/PS-Openshift-Server,sirDonovan/Pokemon-Showdown,LustyAsh/EOS-Master,Pikachuun/Pokemon-Showdown,Sora-League/Sora,anubhabsen/Pokemon-Showdown,iFaZe/SliverX,xCrystal/Pokemon-Showdown,TheDiabolicGift/Showdown-Boilerplate,MayukhKundu/Flame-Savior,CreaturePhil/Showdown-Boilerplate,Firestatics/Firestatics46,Elveman/RPCShowdownServer,Raina4uberz/Light-server,brettjbush/Pokemon-Showdown,Atwar/http-server-femalehq.rhcloud.com-80.psim.us-,Pokemon-Devs/Pokemon-Showdown,SilverTactic/Pokemon-Showdown,jumbowhales/Pokemon-Showdown,BuzzyOG/Pokemon-Showdown,Lauc1an/Perulink-Showdown,AustinXII/Pokemon-Showdown,sama2/Viridian-Pokemon-Showdown,Mystifi/Exiled,Irraquated/Showdown-Boilerplate,AWailOfATail/Pokemon-Showdown,comedianchameleon/test,superman8900/Pokemon-Showdown,DarkSuicune/Kakuja-2.0,SkyeTheFemaleSylveon/Pokemon-Showdown,TheFenderStory/Showdown-Boilerplate,ZestOfLife/FestiveLife,Tesarand/Pokemon-Showdown,Irraquated/Pokemon-Showdown,Vacate/Pokemon-Showdown,EmmaKitty/Pokemon-Showdown,Kill-The-Noise/BlakJack-Boilerplate,SerperiorBae/BaeShowdown,panpawn/Gold-Server,PS-Spectral/Spectral,Lauc1an/Perulink-Showdown,hayleysworld/serenityc9,sama2/Viridian-Pokemon-Showdown,Bryan-0/Pokemon-Showdown,Extradeath/psserver,KewlStatics/Alliance,scotchkorean27/Pokemon-Showdown,TheManwithskills/Server---Thermal,Darkshadow6/git-remote-add-scalingo-git-scalingo.com-pokemoonforums,Articuno-I/Pokemon-Showdown,LegendBorned/PS-Boilerplate,DesoGit/Tsunami_PS,bai2/Dropp,Legit99/Lightning-Storm-Server,Oiawesome/DPPtServ2,SilverTactic/Dragotica-Pokemon-Showdown,Enigami/Pokemon-Showdown,Nineage/Origin,hayleysworld/serenityserver,PS-Spectral/Spectral,theodelhay/test,ZestOfLife/PSserver,MayukhKundu/Mudkip-Server,DesoGit/Tsunami_PS,Pokemon-Devs/Pokemon-Showdown,UniversalMan12/Universe-Server,ShowdownHelper/Saffron,Legit99/Lightning-Storm-Server,KaitoV4X/Showdown,Parukia/Pokemon-Showdown,Enigami/Pokemon-Showdown,Adithya4Uberz/The-Tsunami-League,FakeSloth/Infinite,Lord-Haji/SpacialGaze,Flareninja/Sora,superman8900/Pokemon-Showdown,hayleysworld/asdfasdf,PrimalGallade45/Dropp-Pokemon-Showdown,MayukhKundu/Mudkip-Server,lFernanl/Zero-Pokemon-Showdown,johtooo/PS,Ecuacion/Lumen-Pokemon-Showdown,AWailOfATail/Pokemon-Showdown,hayleysworld/harmonia,Guernouille/Pokemon-Showdown,aakashrajput/Pokemon-Showdown,svivian/Pokemon-Showdown,piiiikachuuu/Pokemon-Showdown,brettjbush/Pokemon-Showdown,Ecuacion/Lumen-Pokemon-Showdown,megaslowbro1/Pokemon-Showdown-Server-for-megaslowbro1,BadSteel/Omega-Pokemon-Showdown,Elveman/RPCShowdownServer,Checkinator/Pokemon-Showdown,SilverTactic/Pokemon-Showdown,BadSteel/Pokemon-Showdown,sama2/Dropp-Pokemon-Showdown,Hidden-Mia/Roleplay-PS,xCrystal/Pokemon-Showdown,MayukhKundu/Technogear-Final,jumbowhales/Pokemon-Showdown,azum4roll/Pokemon-Showdown,kupochu/Pokemon-Showdown,miahjennatills/Pokemon-Showdown,ShowdownHelper/Saffron,yashagl/pokemon-showdown,Irraquated/Pokemon-Showdown,PS-Spectral/Spectral,kotarou3/Krister-Pokemon-Showdown,LightningStormServer/Lightning-Storm,SubZeroo99/Pokemon-Showdown,Ransei1/Alt,SerperiorBae/Bae-Showdown-2,lFernanl/Mudkip-Server,jd4564/Pokemon-Showdown,hayleysworld/serenity,ankailou/Pokemon-Showdown,Zipzapadam/Server,SolarisFox/Pokemon-Showdown,MasterFloat/Pokemon-Showdown,gustavo515/batata,SerperiorBae/Bae-Showdown,SerperiorBae/Bae-Showdown,MeliodasBH/boarhat,Irraquated/Pokemon-Showdown,ehk12/clone,ankailou/Pokemon-Showdown,gustavo515/test,ZestOfLife/PSserver,panpawn/Gold-Server,comedianchameleon/test,BlakJack/Kill-The-Noise,ZeroParadox/BlastBurners,javi501/Lumen-Pokemon-Showdown,Flareninja/Showdown-Boilerplate,SubZeroo99/Pokemon-Showdown,Ridukuo/Test2,ehk12/bigbangtempclone,Celecitia/Plux-Pokemon-Showdown,SerperiorBae/BaeShowdown