diff --git a/README.md b/README.md
index 62c4c652..7f3a59d8 100644
--- a/README.md
+++ b/README.md
@@ -246,6 +246,7 @@
 * Players start each round with at least 10000 points
 * 2 lethal grenades and mines awarded each round
 * Unlimited barrier rebuild points
+* Decrease stun time of unupgraded weapons from 0.75 to 0.5
 * Meleeing enemy players that are already stunned will push them
 * Stunning enemy players steals 10 points from them
 * Downing enemy players awards 5% of their current points
diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc
index 7045dab4..41946d73 100644
--- a/scripts/zm/main/_zm_reimagined_zgrief.gsc
+++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc
@@ -160,7 +160,6 @@ set_grief_vars()
 	level.grief_score = [];
 	level.grief_score["A"] = 0;
 	level.grief_score["B"] = 0;
-	level.game_mode_shellshock_time = 0.75;
 	level.game_mode_griefed_time = 2.5;
 	level.crash_delay = 20;
 
@@ -1050,7 +1049,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			}
 		}
 
-		self thread do_game_mode_shellshock();
+		self thread do_game_mode_shellshock(is_melee, maps/mp/zombies/_zm_weapons::is_weapon_upgraded(sweapon));
 		self playsound( "zmb_player_hit_ding" );
 
 		self thread stun_score_steal(eattacker, 10);
@@ -1058,15 +1057,21 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 	}
 }
 
-do_game_mode_shellshock()
+do_game_mode_shellshock(is_melee, is_upgraded)
 {
 	self notify( "do_game_mode_shellshock" );
 	self endon( "do_game_mode_shellshock" );
 	self endon( "disconnect" );
 
+	time = 0.5;
+	if(is_melee || is_upgraded)
+	{
+		time = 0.75;
+	}
+
 	self._being_shellshocked = 1;
-	self shellshock( "grief_stab_zm", level.game_mode_shellshock_time );
-	wait level.game_mode_shellshock_time;
+	self shellshock( "grief_stab_zm", time );
+	wait time;
 	self._being_shellshocked = 0;
 }