Merge branch 'fruitiex/balance' into fruitiex/ctsfix

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index 1369075aa474627ce6c2e160bf45b86a8a353111,03882aeffd4664bb4df6dd86a83bce068858a5f8..51eff15108e60aee0c3ff741ee23e46ac138d67f
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -616,20 -625,27 +625,27 @@@ set g_ca_damage2score_multiplier 0.0
  set g_ca_round_timelimit 180
  set g_nexball_respawn_delay 0
  set g_nexball_respawn_waves 0
+ set g_nexball_weapon_stay 0
  set g_as_respawn_delay 0
  set g_as_respawn_waves 0
+ set g_as_weapon_stay 1
  set g_ons_respawn_delay 0
  set g_ons_respawn_waves 0
+ set g_ons_weapon_stay 0
  set g_rc_respawn_waves 0
  set g_rc_respawn_delay 0
+ set g_rc_weapon_stay 0
  set g_cts_respawn_waves 0
 -set g_cts_respawn_delay 0.25
 +set g_cts_respawn_delay 0
  set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
  set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
+ set g_cts_weapon_stay 1
  set g_freezetag_respawn_waves 0
 -set g_freezetag_respawn_delay 0.25
 +set g_freezetag_respawn_delay 0
+ set g_freezetag_weapon_stay 1
  set g_ka_respawn_delay 0
  set g_ka_respawn_waves 0
+ set g_ka_weapon_stay 0
  
  // overtime
  seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"

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