Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_nades.qc

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 9199fe1eaf032f5343cd07f421e9fd2a178ecaaf..0adff6068c77770b6b754c1aa053ae194b51b2b3 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -795,6 +795,10 @@ float nade_customize()
 
 void nade_prime()
 {
+       if(autocvar_g_nades_bonus_only)
+       if(!self.bonus_nades)
+               return; // only allow bonus nades
+
        if(self.nade)
                remove(self.nade);