Implement ValveSoftware#1540

Author: Bitl

game/quiver/info_changelog.txt

@@ -91,6 +91,8 @@ Added the following Source SDK Pull Requests:
 	- #1533: MvM Tank support for Mappers/Vscripters
 	- #1532: Fix team skins for tf_projectile_rocket
 	- #1539: Allow weapons with penetrating bullets to penetrate Medigun shield
+	- #1540: Fixed on-hit attributes not triggering on friendly disguises
+	- 
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/shared/tf/tf_weaponbase.cpp

@@ -5448,7 +5448,11 @@ void CTFWeaponBase::ApplyOnHitAttributes( CBaseEntity *pVictimBaseEntity, CTFPla
 		}
 
 		// On hit attributes don't work when you shoot disguised spies
+#ifdef BDSBASE
+		if (pVictim->m_Shared.InCond(TF_COND_DISGUISED) && pVictim->m_Shared.GetDisguiseTeam() != pVictim->GetTeamNumber())
+#else
 		if ( pVictim->m_Shared.InCond( TF_COND_DISGUISED ) )
+#endif
 			return;
 	}