From 7222c99b77585c0e2e3272eb66900459fbf2adb3 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Fri, 21 Feb 2020 12:41:45 -0800
Subject: [PATCH] Jet Gun: no longer dropped

---
 README.md          | 1 +
 _zm_reimagined.gsc | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a8d21270..828b7ca9 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@
 * Cools down twice as fast
 * Cools down while not holding weapon
 * No longer automatically switched to weapon when picked up
+* No longer dropped to the ground when another buildable is taken
 * No longer disassembles when overheated
 * Weapon is taken when overheated
 
diff --git a/_zm_reimagined.gsc b/_zm_reimagined.gsc
index 5feb26f1..07b513b6 100644
--- a/_zm_reimagined.gsc
+++ b/_zm_reimagined.gsc
@@ -78,6 +78,8 @@ post_all_players_spawned()
 	electric_trap_always_kill();
 
 	jetgun_disable_explode_overheat();
+	jetgun_remove_forced_weapon_switch();
+	jetgun_remove_drop_fn();
 
 	slipgun_always_kill();
 	slipgun_disable_reslip();
@@ -91,8 +93,6 @@ post_all_players_spawned()
 
 	level thread zombie_health_fix();
 
-	level thread jetgun_remove_forced_weapon_switch();
-
 	level thread transit_power_local_electric_doors_globally();
 
 	level thread screecher_decrease_health();
@@ -699,6 +699,11 @@ jetgun_remove_forced_weapon_switch()
 	}
 }
 
+jetgun_remove_drop_fn()
+{
+	level.zombie_equipment["jetgun_zm"].drop_fn = undefined;
+}
+
 slipgun_always_kill()
 {
 	level.slipgun_damage = maps/mp/zombies/_zm::ai_zombie_health( 255 );