Merge remote branch 'origin/terencehill/minstagib_outofammo'

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/w_minstanex.qc
Simple merge