Merge branch 'Mario/lms_pickup_items' into 'master'

Merge branch Mario/lms_pickup_items (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!934

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index b603a2bd81da44054a4006056ad080fc9cc2349a..8f545955caefc20137883d1d15f9c066ec610eb5 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -420,7 +420,7 @@ MUTATOR_HOOKFUNCTION(lms, FilterItemDefinition)
        {
                return false;
        }
-       return true;
+       return (autocvar_g_pickup_items <= 0); // only allow items if explicitly enabled
 }
 
 void lms_extralife(entity this)