Merge branch 'Mario/minor_fixes' into 'master'

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

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 7673d8bd359cc25adec0d1ccd25b2adc2094b066..5e900a603977c0b12cc1eb6d834dd545aa699e6e 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -1101,7 +1101,8 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
        //this.effects |= EF_LOWPRECISION;
 
        // support skinned models for powerups
-       this.skin = def.m_skin;
+       if(!this.skin)
+               this.skin = def.m_skin;
 
        setsize (this, this.pos1 =  def.m_mins, this.pos2 = def.m_maxs);