From: Mario Date: Sat, 23 May 2020 10:45:49 +0000 (+0000) Subject: Merge branch 'bones_was_here/guard-resistance' into 'master' X-Git-Tag: xonotic-v0.8.5~1047 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07a09abd9a97bbd7939e38bea4841e7d5e88dcce;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'bones_was_here/guard-resistance' into 'master' Change Q3TA/QL item_guard to spawn resistance buff instead of medic See merge request xonotic/xonotic-data.pk3dir!805 --- 07a09abd9a97bbd7939e38bea4841e7d5e88dcce