Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 878)
+++ src/game/g_cmds.c	(working copy)
@@ -1777,8 +1777,9 @@
       else
         G_FreeEntity( traceEnt );
 
-      ent->client->ps.stats[ STAT_MISC ] +=
-        BG_FindBuildDelayForWeapon( ent->s.weapon ) >> 2;
+      if( !g_cheats.integer )
+        ent->client->ps.stats[ STAT_MISC ] +=
+          BG_FindBuildDelayForWeapon( ent->s.weapon ) >> 2;
     }
   }
 }
Index: src/game/g_weapon.c
===================================================================
--- src/game/g_weapon.c	(revision 878)
+++ src/game/g_weapon.c	(working copy)
@@ -759,20 +759,23 @@
 
     if( G_ValidateBuild( ent, ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) )
     {
-      if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && !G_isOvermind( ) )
+      if( !g_cheats.integer )
       {
-        ent->client->ps.stats[ STAT_MISC ] +=
-          BG_FindBuildDelayForWeapon( ent->s.weapon ) * 2;
+        if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && !G_isOvermind( ) )
+        {
+          ent->client->ps.stats[ STAT_MISC ] +=
+            BG_FindBuildDelayForWeapon( ent->s.weapon ) * 2;
+        }
+        else if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS && !G_isPower( muzzle ) &&
+            ( ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) != BA_H_REPEATER ) //hack
+        {
+          ent->client->ps.stats[ STAT_MISC ] +=
+            BG_FindBuildDelayForWeapon( ent->s.weapon ) * 2;
+        }
+        else
+          ent->client->ps.stats[ STAT_MISC ] +=
+            BG_FindBuildDelayForWeapon( ent->s.weapon );
       }
-      else if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS && !G_isPower( muzzle ) &&
-          ( ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) != BA_H_REPEATER ) //hack
-      {
-        ent->client->ps.stats[ STAT_MISC ] +=
-          BG_FindBuildDelayForWeapon( ent->s.weapon ) * 2;
-      }
-      else
-        ent->client->ps.stats[ STAT_MISC ] +=
-          BG_FindBuildDelayForWeapon( ent->s.weapon );
 
       ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;