diff --git a/README.md b/README.md index 23304e3f..a8eded13 100644 --- a/README.md +++ b/README.md @@ -247,7 +247,8 @@ * Players start each round with at least 10000 points * 2 lethal grenades and mines awarded each round * Unlimited barrier rebuild points -* Decreased stun time of unupgraded weapons from 0.75 to 0.5 +* Decreased stun time of unupgraded weapons by 50% +* Decreased stun time of upgraded weapons by 33% * Meleeing enemy players pushes 17% farther for every 500 damage that melee weapon deals * Meleeing enemy players that are crouched pushes 50% of the amount when standing * Meleeing enemy players that are prone pushes 25% of the amount when standing diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc index ad73e67c..5a580fb1 100644 --- a/scripts/zm/main/_zm_reimagined_zgrief.gsc +++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc @@ -1080,15 +1080,19 @@ do_game_mode_shellshock(is_melee, is_upgraded) self endon( "do_game_mode_shellshock" ); self endon( "disconnect" ); - time = 0.5; - if(is_melee || is_upgraded) + time = 0.375; + if(is_melee) { time = 0.75; } + else if(is_upgraded) + { + time = 0.5; + } self._being_shellshocked = 1; self shellshock( "grief_stab_zm", time ); - wait time; + wait 0.75; self._being_shellshocked = 0; }