Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / monster / stingray.qc

diff --git a/qcsrc/server/monsters/monster/stingray.qc b/qcsrc/server/monsters/monster/stingray.qc
index 7408fa8971292ce83930d556508f7e346d2c5052..61dccfbd6af3f80e4231cd7fead87b006a2170ba 100644 (file)
--- a/qcsrc/server/monsters/monster/stingray.qc
+++ b/qcsrc/server/monsters/monster/stingray.qc
@@ -31,9 +31,7 @@ float stingray_attack(float attack_type)
                {
                        monsters_setframe(stingray_anim_attack);
                        self.attack_finished_single = time + 0.5;
-                       if(monster_melee(self.enemy, autocvar_g_monster_stingray_damage, 0.1, DEATH_MONSTER_STINGRAY, FALSE))
-                       if(random() < 0.2)
-                               Fire_AddDamage(self.enemy, self, 30, 10, DEATH_MONSTER_STINGRAY, TRUE);
+                       monster_melee(self.enemy, autocvar_g_monster_stingray_damage, 0.1, DEATH_MONSTER_STINGRAY, FALSE);
                        
                        return TRUE;
                }