diff -r 9d57189def5c zap/WeaponInfo.h
--- a/zap/WeaponInfo.h	Mon Sep 24 12:36:33 2012 -0600
+++ b/zap/WeaponInfo.h	Mon Sep 24 21:27:44 2012 -0500
@@ -42,14 +42,14 @@
    //                                          Enum in Lua:   Fire  Min    Enrgy  Proj Proj. Dam-  Self-dam. Can dam.   Projectile
    //             Enum             Name        Weapon.Phaser  Delay Enrgy  Drain  Vel. Life  age    Factor   Teammate      Type
 #define WEAPON_ITEM_TABLE \
-   WEAPON_ITEM(WeaponPhaser,     "Phaser",      "Phaser",     100,   500,   500,  600, 1000, 0.21f,  0,       false, ProjectilePhaser ) \
-   WEAPON_ITEM(WeaponBounce,     "Bouncer",     "Bouncer",    100,  1800,  1800,  540, 1500, 0.15f,  0.5f,    false, ProjectileBounce ) \
-   WEAPON_ITEM(WeaponTriple,     "Triple",      "Triple",     200,  1700,  1700,  550,  850, 0.14f,  0,       false, ProjectileTriple ) \
-   WEAPON_ITEM(WeaponBurst,      "Burst",       "Burst",      700,  5000,  5000,  500, 1000, 0.50f,  1.0f,    false, NotAProjectile   ) \
-   WEAPON_ITEM(WeaponHeatSeeker, "Seeker",      "Seeker",     700, 20000, 20000,  600, 8000, 0.26f,  1.0f,    false, NotAProjectile   ) \
-   WEAPON_ITEM(WeaponMine,       "Mine",        "Mine",       900, 55000, 55000,  500,   -1, 0.50f,  1.0f,    true,  NotAProjectile   ) \
-   WEAPON_ITEM(WeaponTurret,     "Turret",      "Turret",     150,     0,     0,  800,  800, 0.11f,  1.0f,    true,  ProjectileTurret ) \
-   WEAPON_ITEM(WeaponSpyBug,     "Spy Bug",     "SpyBug",     800, 50000, 50000,  800,   -1, 0,      0,       true,  NotAProjectile   ) \
+   WEAPON_ITEM(WeaponPhaser,     "Phaser",      "Phaser",     1,   500,   500,  600, 1000, 0.21f,  0,       false, ProjectilePhaser ) \
+   WEAPON_ITEM(WeaponBounce,     "Bouncer",     "Bouncer",    1,  1800,  1800,  540, 1500, 0.15f,  0.5f,    false, ProjectileBounce ) \
+   WEAPON_ITEM(WeaponTriple,     "Triple",      "Triple",     1,  1700,  1700,  550,  850, 0.14f,  0,       false, ProjectileTriple ) \
+   WEAPON_ITEM(WeaponBurst,      "Burst",       "Burst",      1,  5000,  5000,  500, 1000, 0.50f,  1.0f,    false, NotAProjectile   ) \
+   WEAPON_ITEM(WeaponHeatSeeker, "Seeker",      "Seeker",     1, 20000, 20000,  600, 8000, 0.26f,  1.0f,    false, NotAProjectile   ) \
+   WEAPON_ITEM(WeaponMine,       "Mine",        "Mine",       1, 55000, 55000,  500,   -1, 0.50f,  1.0f,    true,  NotAProjectile   ) \
+   WEAPON_ITEM(WeaponTurret,     "Turret",      "Turret",     1,     0,     0,  800,  800, 0.11f,  1.0f,    true,  ProjectileTurret ) \
+   WEAPON_ITEM(WeaponSpyBug,     "Spy Bug",     "SpyBug",     1, 50000, 50000,  800,   -1, 0,      0,       true,  NotAProjectile   ) \
 
 
 // Define an enum from the first values in WEAPON_ITEM_TABLE
diff -r 9d57189def5c zap/ship.h
--- a/zap/ship.h	Mon Sep 24 12:36:33 2012 -0600
+++ b/zap/ship.h	Mon Sep 24 21:27:44 2012 -0500
@@ -90,14 +90,14 @@
    static const S32 RepairRadius = 65;
    static const U32 SpawnShieldTime = 5000;        // Time spawn shields are active
    static const U32 SpawnShieldFlashTime = 1500;   // Time at which shields start to flash
-   static const S32 PulseMaxVelocity = 2500; // Maximum speed of Pulse
-   static const S32 PulseMinVelocity = 1000; // Minimum speed of Pulse
+   static const S32 PulseMaxVelocity = 2500000; // Maximum speed of Pulse
+   static const S32 PulseMinVelocity = 1000000; // Minimum speed of Pulse
 
    enum {
-      MaxVelocity = 450,        // points per second
-      Acceleration = 2500,      // points per second per second
-      BoostMaxVelocity = 700,   // points per second
-      BoostAcceleration = 5000, // points per second per second
+      MaxVelocity = 100000,        // points per second
+      Acceleration = 25000,      // points per second per second
+      BoostMaxVelocity = 7000000,   // points per second
+      BoostAcceleration = 50000000, // points per second per second
 
       VisibilityRadius = 30,
       KillDeleteDelay = 1500,
@@ -107,7 +107,7 @@
       EnergyMax = 100000,
 
       // The following are all measured in units of energy/millisecond
-      EnergyRechargeRate = 8,
+      EnergyRechargeRate = 99999,
       EnergyRechargeRateMovementModifier = -2,
       EnergyRechargeRateInHostileLoadoutZoneModifier = -20,
       EnergyRechargeRateInNeutralLoadoutZoneModifier = 4,
@@ -171,8 +171,8 @@
    Timer mModuleSecondaryTimer[ModuleCount];  // Timer to prevent accidentally firing in quick succession
    Timer mSpyBugPlacementTimer;
    Timer mIdleRechargeCycleTimer;
-   static const U32 ModuleSecondaryTimerDelay = 500;
-   static const U32 SpyBugPlacementTimerDelay = 800;
+   static const U32 ModuleSecondaryTimerDelay = 1;
+   static const U32 SpyBugPlacementTimerDelay = 1;
    static const U32 IdleRechargeCycleTimerDelay = 2000;
 
 #ifndef ZAP_DEDICATED