Merge branch 'master' into z411/bai-server

diff --cc qcsrc/client/hud/panel/weapons.qc
Simple merge

diff --cc qcsrc/common/_all.inc
Simple merge

diff --cc qcsrc/common/ent_cs.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
Simple merge

diff --cc qcsrc/common/notifications/all.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/vortex.qh
Simple merge

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

diff --cc qcsrc/server/client.qh
Simple merge

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

diff --cc qcsrc/server/items/items.qc
index 3e958ec2db8125f248458eba07ac98da71dc8603,0ea10da5e389ef37a23402584390aa671470fa16..a59d465e824465009bbbfcd777e35fe3490a354d
--- 1/qcsrc/server/items/items.qc
--- 2/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@@ -11,8 -11,8 +11,9 @@@
  #include <common/mutators/mutator/buffs/sv_buffs.qh>
  #include <common/mutators/mutator/powerups/_mod.qh>
  #include <common/mutators/mutator/status_effects/_mod.qh>
 +#include <common/net_linked.qh>
  #include <common/notifications/all.qh>
+ #include <common/resources/resources.qh>
  #include <common/util.qh>
  #include <common/weapons/_all.qh>
  #include <common/wepent.qh>

diff --cc qcsrc/server/mutators/events.qh
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
index ecdd0f9a13e85f436fe55bf27cce9aabf530822b,fcce2a23d7a3c2427ae03a31c0b15efcfe57ce0b..11833e50be926c7d451cd4bef72cf0d8c21ea74c
--- 1/qcsrc/server/weapons/weaponsystem.qc
--- 2/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@@ -6,9 -6,9 +6,10 @@@
  #include <common/mapobjects/platforms.qh>
  #include <common/monsters/_mod.qh>
  #include <common/mutators/mutator/status_effects/_mod.qh>
 +#include <common/ent_cs.qh>
  #include <common/net_linked.qh>
  #include <common/notifications/all.qh>
+ #include <common/resources/sv_resources.qh>
  #include <common/state.qh>
  #include <common/util.qh>
  #include <common/vehicles/all.qh>