From: LegendaryGuard <rootuser999@gmail.com>
Date: Wed, 5 Jan 2022 18:31:55 +0000 (+0100)
Subject: Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into LegendaryGuard/cyber
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c9f2dd08ea73cdfb303c765de2e07519bd401bc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into LegendaryGuard/cyber
---

4c9f2dd08ea73cdfb303c765de2e07519bd401bc
diff --cc qcsrc/common/mutators/mutator/nades/nades.qh
index b72bb5096,eba6f2aa0..8e3cca874
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@@ -318,10 -256,16 +256,16 @@@ MUTATOR_HOOKFUNCTION(cl_darkblink, Draw
  
  MUTATOR_HOOKFUNCTION(cl_darkblink, HUD_Draw_overlay)
  {
- 	if(!darkblink && !quadratic2)
+ 	if(!darkblink)
  		return false;
+ 	
+ 	if (g_stat_HEALTH < 0)
+ 		darkblink = false;
+ 	
 -	if(!STAT(GAME_STOPPED) && !warmup_stage)
++	if(STAT(GAME_STOPPED))
+ 		darkblink = false;
  
- 	if(time <= dark_fadetime && autocvar_hud_panel_darkradar_maximised_zoom_scale == 1)
+ 	if(time <= dark_fadetime)
  	{
  		HUD_DarkBlinking();
  		return false;