From: Mario <mario.mario@y7mail.com>
Date: Tue, 6 Dec 2022 08:06:42 +0000 (+1000)
Subject: Allow mappers to define item skins
X-Git-Tag: xonotic-v0.8.6~267^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c17b948d800cf6abf41f88c8d0acc07fb5d2079a;p=xonotic%2Fxonotic-data.pk3dir.git

Allow mappers to define item skins
---

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 6a19a435f..7f3a1c7c1 100644
--- 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);