Merge branch 'master' into Mario/status_effects_extended

author Mario <mario.mario@y7mail.com>

Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)

committer Mario <mario.mario@y7mail.com>

Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
author Mario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
committer Mario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/items/items.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
		1	2
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	patch \|	diff1 \|	diff2 \|	blob \| history