Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

diff --combined defaultXonotic.cfg
index b06d2825723bfa5eb358c1668ca936bf3c945392,55e0b2c46afe2a048e8ba3b5fe521409174f20ff..5535d9cceea250f59dc2d592ec28fe929ec17229
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -498,7 -498,7 +498,7 @@@ set g_shootfromeye 0 "shots are fired f
  set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2"
  set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used"
  set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed"
- set g_weapon_stay 0 "1: ghost weapons can be picked up too but give no ammo"
+ set g_weapon_stay 0 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
  set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
  set g_powerups -1 "if set to 0 the strength and shield (invincibility) will not spawn on the map, if 1 they will spawn in all game modes, -1 is game mode default"
  set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition"
@@@ -686,7 -686,7 +686,7 @@@ set g_cts_respawn_waves 
  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_cts_weapon_stay 2
  set g_freezetag_respawn_waves 0
  set g_freezetag_respawn_delay 0
  set g_freezetag_weapon_stay 0
@@@ -995,7 -995,8 +995,8 @@@ seta cl_notify_carried_items "3" "notif
  
  // startmap_dm is used when running with the -listen or -dedicated commandline options
  set serverconfig server.cfg
- alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
+ set _sv_init 0
+ alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
  alias sv_loadconfig "exec $serverconfig"
  alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
  
@@@ -1628,7 -1629,6 +1629,7 @@@ set capturelimit 
  // these entities are not referenced by anything directly, they just represent
  // teams and are found by find() when needed
  prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
 +prvm_backtraceforwarnings 1
  
  sv_allowdownloads_inarchive 1 // for csprogs.dat
  sv_allowdownloads 0 // download protocol is evil
@@@ -1779,6 -1779,11 +1780,11 @@@ seta cl_gentle_damage 0               "client side g
  set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)"
  
  set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."
+ set g_bastet 0 "don't try"
+ set g_loituma 0 "no, really"
+ 
+ set _urllib_nextslot 0 "temp variable"
+ set cl_warpzone_usetrace 1 "do not touch"
  
  set cl_effects_lightningarc_simple 0
  set cl_effects_lightningarc_segmentlength 64