diff --git a/README.md b/README.md
index bed7825b..2552f106 100644
--- a/README.md
+++ b/README.md
@@ -562,16 +562,17 @@
 
 ### Origins
 * Door prices in solo cost the same as in coop
-* Players can go prone on the tank
 * Shovels automatically picked up
 * Records automatically picked up
 * Gramophone initially spawns at Excavation Site gramophone table
 * Musical parts no longer show on HUD
-* Giant Robots: each robot has an openable foot when 3 robots are active
 * Generators: increased capture reward points from 100 to 200
 * Generators: always give back refund points if player was in the generator zone when captured
 * Generators: recapture round zombies only drop Max Ammo if killed before taking first generator
 * Generators: fixed an issue where recapture sound and fx would play twice
+* Giant Robots: each robot has an openable foot when 3 robots are active
+* Tank: players can go prone
+* Tank: changed cooldown to 30 seconds (normally 2-120 seconds depending on how long players were on the tank)
 * Teleporters: stay active after picking up gramophone
 * Teleporters: placing gramophone activates The Crazy Place teleporters
 * Teleporters: players face away from the teleporters when returning from The Crazy Place
diff --git a/scripts/zm/replaced/zm_tomb_tank.gsc b/scripts/zm/replaced/zm_tomb_tank.gsc
index 7ac7a7ad..ba9b87d4 100644
--- a/scripts/zm/replaced/zm_tomb_tank.gsc
+++ b/scripts/zm/replaced/zm_tomb_tank.gsc
@@ -55,4 +55,16 @@ players_on_tank_update()
 
         wait 0.05;
     }
+}
+
+wait_for_tank_cooldown()
+{
+    self thread snd_fuel();
+
+    self.n_cooldown_timer = 30;
+
+    wait( self.n_cooldown_timer );
+    level notify( "stp_cd" );
+    self playsound( "zmb_tank_ready" );
+    self playloopsound( "zmb_tank_idle" );
 }
\ No newline at end of file
diff --git a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
index 7356fae1..7beeb9c2 100644
--- a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
+++ b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
@@ -46,6 +46,7 @@ main()
 	replaceFunc(maps\mp\zm_tomb_dig::increment_player_perk_purchase_limit, scripts\zm\replaced\zm_tomb_dig::increment_player_perk_purchase_limit);
     replaceFunc(maps\mp\zm_tomb_giant_robot::robot_cycling, scripts\zm\replaced\zm_tomb_giant_robot::robot_cycling);
     replaceFunc(maps\mp\zm_tomb_tank::players_on_tank_update, scripts\zm\replaced\zm_tomb_tank::players_on_tank_update);
+    replaceFunc(maps\mp\zm_tomb_tank::wait_for_tank_cooldown, scripts\zm\replaced\zm_tomb_tank::wait_for_tank_cooldown);
     replaceFunc(maps\mp\zm_tomb_teleporter::teleporter_init, scripts\zm\replaced\zm_tomb_teleporter::teleporter_init);
     replaceFunc(maps\mp\zombies\_zm_ai_mechz::mechz_set_starting_health, scripts\zm\replaced\_zm_ai_mechz::mechz_set_starting_health);
     replaceFunc(maps\mp\zombies\_zm_craftables::choose_open_craftable, scripts\zm\replaced\_zm_craftables::choose_open_craftable);