Merge branch 'LegendaryGuard/ttt' into z411/bai-server

diff --cc gamemodes-server.cfg
index 5931533a9cd1455403862c11491f812089bad397,8121dab8bb08ef69a127228765855a8610d02f4f..73f779a92c970ddaaa8652b527bf1c46ff45a6c0
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -606,38 -589,4 +607,38 @@@ set g_mmm_karma_bantime 1800 "number o
  set g_mmm_karma_damageactive 1 "enable karma damage rule. If a player's karma is low, they will not do as much damage as a player who has high or full karma"
  set g_mmm_karma_damagepunishmentdeal 20 "punishment damage points when player kills an ally"
  set g_mmm_karma_severity 0.25 "how severe karma is to decrease karma points to the players [0.1 - 1.0]"
 -set g_mmm_reward_detective 1 "give a point to all detective players if investigated corpses"
 +set g_mmm_reward_sleuth 1 "give a point to all sleuth players if investigated corpses"
++set g_mmm_reward_detective 1 "give a point to all detective players if investigated corpses"
 +
 +// ==============================
 +//  free for all and team mayhem
 +// ==============================
 +set g_mayhem 0 "Mayhem: the player with the most frags in total mayhem wins"
 +set g_tmayhem 0 "Team Mayhem: the team with the most frags in total mayhem wins"
 +
 +set g_mayhem_scoringmethod 1 "1: 25% of the score is based on kills and 75% of it is based on damage. 2: 100% frags. 3: 100% damage."
 +set g_tmayhem_scoringmethod 1 "1: 25% of the score is based on kills and 75% of it is based on damage. 2: 100% frags. 3: 100% damage."
 +
 +set g_mayhem_fraglimit 30 "Team Mayhem basis for how many frags until the match ends, edit this over point_limit preferably"
 +set g_tmayhem_fraglimit 50 "Team Mayhem basis for how many frags until the match ends, edit this over point_limit preferably"
 +
 +set g_mayhem_visual_score_limit 1000 "Mayhem visual score limit overriding the mapinfo specified one"
 +set g_tmayhem_visual_score_limit 1000 "Team Mayhem visual score limit overriding the mapinfo specified one"
 +
 +set g_tmayhem_score_leadlimit -1 "Team Mayhem score lead limit(based on tmayhem_visual_score_limit, not tmayhem_fraglimit) overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 +
 +set g_mayhem_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
 +set g_tmayhem_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
 +
 +set g_mayhem_powerups 1 "Allow powerups in mayhem. Only checked if g_powerups is -1 therefore this will be overridden by g_powerups 1 or 0"
 +set g_tmayhem_powerups 1 "Allow powerups in team mayhem. Only checked if g_powerups is -1 therefore this will be overridden by g_powerups 1 or 0"
 +
 +set g_mayhem_selfdamage 0 "0 = disable selfdamage in mayhem, 1 = enable selfdamage in mayhem"
 +set g_tmayhem_selfdamage 0 "0 = disable selfdamage in tmayhem, 1 = enable selfdamage in tmayhem"
 +
 +set g_mayhem_regenerate 0 "allow players to regenerate hp. rates controlled by hp regeneration and rotting cvars"
 +set g_tmayhem_regenerate 0 "allow players to regenerate hp. rates controlled by hp regeneration and rotting cvars"
 +
 +set g_tmayhem_teams 2 "how many teams are in team mayhem (set by mapinfo)"
 +set g_tmayhem_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
 +set g_tmayhem_teams_override 0        "how many teams are in team mayhem"
- 

diff --cc notifications.cfg
Simple merge

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