From: drjaska <drjaska83@gmail.com>
Date: Fri, 25 Oct 2024 22:50:19 +0000 (+0300)
Subject: Merge branch 'master' into pending-release
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b6c3d861d09575283b2b2d7dcaf81133e54f5d09;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into pending-release
---

b6c3d861d09575283b2b2d7dcaf81133e54f5d09
diff --cc qcsrc/server/client.qc
index 7216b4061,a0f3c7eaf..90c40399a
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -1326,10 -1348,10 +1348,10 @@@ void ChatBubbleThink(entity this
  
  	this.mdl = "";
  
- 	if ( !IS_DEAD(this.owner) && IS_PLAYER(this.owner) )
+ 	if ( !IS_DEAD(this.owner) && IS_PLAYER(this.owner) && !MUTATOR_CALLHOOK(ShowChatBubble, this.owner, this) )
  	{
  		if ( CS(this.owner).active_minigame && PHYS_INPUT_BUTTON_MINIGAME(this.owner) )
 -			this.mdl = "models/sprites/minigame_busy.iqm";
 +			this.mdl = "models/misc/minigame_busy.spr";
  		else if (PHYS_INPUT_BUTTON_CHAT(this.owner))
  			this.mdl = "models/misc/chatbubble.spr";
  	}