From: Mario <zacjardine@y7mail.com>
Date: Thu, 8 Feb 2018 00:58:09 +0000 (+0000)
Subject: Merge branch 'martin-t/shield' into 'master'
X-Git-Tag: xonotic-v0.8.5~2338
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a85c24fccad878b5dbf92c0e98160afe91f8d1b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/shield' into 'master'

Make shield reduce force as well (unless selfpush)

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

5a85c24fccad878b5dbf92c0e98160afe91f8d1b