From: terencehill <piuntn@gmail.com>
Date: Thu, 2 Jan 2025 12:48:06 +0000 (+0000)
Subject: Merge branch 'k9er/show-vaporizer-dmgtxt' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=524e33a25be6eacf70fc7d9b62dfd08b7bbb9d1d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'k9er/show-vaporizer-dmgtxt' into 'master'

Show Vaporizer damagetext when not playing InstaGib

Closes #1879

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

524e33a25be6eacf70fc7d9b62dfd08b7bbb9d1d