diff -r openArenaEliminationB13/code/game/g_client.c openArenaEliminationB14/code/game/g_client.c
1393,1396c1393,1401
< 	if( ( ( g_gametype.integer == GT_ELIMINATION ||
< 		g_gametype.integer == GT_CTF_ELIMINATION ) &&
< 		!level.intermissiontime  ) &&
< 		( client->sess.sessionTeam != TEAM_SPECTATOR ) )
---
> 	if( 
> 	( 
> 		( 
> 			g_gametype.integer == GT_ELIMINATION ||
> 			g_gametype.integer == GT_CTF_ELIMINATION ) &&
> 			(!level.intermissiontime || level.warmupTime != 0)
> 		) &&
> 		( client->sess.sessionTeam != TEAM_SPECTATOR ) 
> 	)
1420c1425
< 	if(g_gametype.integer == GT_LMS && client->sess.sessionTeam != TEAM_SPECTATOR && !level.intermissiontime)
---
> 	if(g_gametype.integer == GT_LMS && client->sess.sessionTeam != TEAM_SPECTATOR && (!level.intermissiontime || level.warmupTime != 0))
diff -r openArenaEliminationB13/code/game/g_main.c openArenaEliminationB14/code/game/g_main.c
1627a1628,1638
> //Things to do during match warmup
> void WarmupEliminationRound(void) {
> 	EnableWeapons();
> 	level.roundNumberStarted = level.roundNumber-1;
> 	level.roundStartTime = level.time+1000*g_elimination_warmup.integer;
> 	SendEliminationMessageToAllClients();
> 	level.roundRespawned = qfalse;
> 	if(g_elimination_ctf_oneway.integer)
> 		SendAttackingTeamMessageToAllClients();
> }
> 
1644a1656,1658
> 	if ( level.warmupTime != 0)
> 		return;
> 
1695a1710,1711
> 	
> 
1765c1781
< 			RestartEliminationRound(); //Start over
---
> 			WarmupEliminationRound(); //Start over
1768a1785,1792
> 		if(level.warmupTime != 0) {
> 			if(level.time+1000*g_elimination_warmup.integer-500>level.roundStartTime)
> 			{
> 				RespawnDead();
> 				WarmupEliminationRound();
> 			}
> 		}
> 
1898c1922
< 			RestartEliminationRound(); //Start over
---
> 			WarmupEliminationRound(); //Start over
1900a1925,1932
> 
> 		if(level.warmupTime != 0) {
> 			if(level.time+1000*g_elimination_warmup.integer-500>level.roundStartTime)
> 			{
> 				RespawnDead();
> 				WarmupEliminationRound();
> 			}
> 		}
1915a1948,1951
> 	//Do nothing if warmup
> 	if(level.warmupTime != 0)
> 		return; 
> 
2004c2040
< 		if ( g_gametype.integer > GT_TEAM ) {
---
> 		if ( g_gametype.integer > GT_TEAM && !g_ffa_gt ) {
diff -r openArenaEliminationB13/code/game/g_weapon.c openArenaEliminationB14/code/game/g_weapon.c
821,822c821,822
< 	if (g_gametype.integer == GT_ELIMINATION && level.roundStartTime>level.time)
< 		return;
---
> 	//if (g_gametype.integer == GT_ELIMINATION && level.roundStartTime>level.time )
> 	//	return;