Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'

# By Mario
# Via Mario
* origin/Mario/spawnsystem_mutator:
  Fix compile error
  Merge spawnsystem into the existing mutator
  Move overkill's spawn system into a separate mutator

diff --combined qcsrc/server/autocvars.qh
index 69d66cc041f1a834d6f40b9769c1df0213ee0dc1,85daa81b36a5c927bbfe9f50378f3ab6d737dea3..674c95b14ea735e2b67e0cb063f21702e2a1c754
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -795,6 -795,7 +795,6 @@@ float autocvar_g_domination_point_leadl
  float autocvar_g_domination_point_rate;
  float autocvar_g_domination_teams_override;
  float autocvar_g_forced_respawn;
 -float autocvar_g_respawn_delay_max;
  string autocvar_g_forced_team_blue;
  string autocvar_g_forced_team_otherwise;
  string autocvar_g_forced_team_pink;
@@@ -943,11 -944,7 +943,11 @@@ float autocvar_g_projectiles_spread_sty
  float autocvar_g_race_qualifying_timelimit;
  float autocvar_g_race_qualifying_timelimit_override;
  float autocvar_g_race_teams;
 -float autocvar_g_respawn_delay;
 +float autocvar_g_respawn_delay_small;
 +float autocvar_g_respawn_delay_small_count;
 +float autocvar_g_respawn_delay_large;
 +float autocvar_g_respawn_delay_large_count;
 +float autocvar_g_respawn_delay_max;
  float autocvar_g_respawn_ghosts;
  float autocvar_g_respawn_ghosts_maxtime;
  float autocvar_g_respawn_ghosts_speed;
@@@ -1272,3 -1269,9 +1272,9 @@@ float autocvar_g_campcheck_damage
  float autocvar_g_campcheck_distance;
  float autocvar_g_campcheck_interval;
  float autocvar_g_jump_grunt;
+ float autocvar_g_spawn_near_teammate_distance;
+ float autocvar_g_spawn_near_teammate_ignore_spawnpoint;
+ float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
+ float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
+ float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
+ float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;