Revert "Merge branch 'master' of git://github.com/tgstation/-tg-station"

This reverts commit 838fec741b1a77f3090bf66b9b3c4c9739ce7fa4, reversing
changes made to 8a75775670b5a2bffb37f0f1317610865a5ccdad.
Revert "Chaplains holy sword"

This reverts commit b911518ad894911dd107aecf924013001c03d7c4.

Conflicts:
	code/game/jobs/job/civilian_chaplain.dm