Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / electro.qc

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index 280267a9ad3de6368294cb332cc34a829c261720..a5c2b86e8bd067d434ade4edf6a57f3324dd2c6d 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -77,13 +77,15 @@ void W_Electro_ExplodeCombo(entity this)
 
 void W_Electro_Explode(entity this, entity directhitentity)
 {
-       if(directhitentity.takedamage == DAMAGE_AIM)
+       /*if(directhitentity.takedamage == DAMAGE_AIM)
                if(IS_PLAYER(directhitentity))
                        if(DIFF_TEAM(this.realowner, directhitentity))
                                if(!IS_DEAD(directhitentity))
-                                       if(IsFlying(directhitentity))
-                                               Send_Notification(NOTIF_ONE, this.realowner, MSG_ANNCE, ANNCE_ACHIEVEMENT_ELECTROBITCH);
-
+                                       if(IsFlying(directhitentity)) {
+                                               Give_Medal(this.realowner, ELECTROBITCH);
+                                       }
+       */
+       
        this.event_damage = func_null;
        this.takedamage = DAMAGE_NO;
        this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work