diff --git a/dlls/gearbox/fgrunt.cpp b/dlls/gearbox/fgrunt.cpp
index c7aa5a3c3f..841e11b51a 100644
--- a/dlls/gearbox/fgrunt.cpp
+++ b/dlls/gearbox/fgrunt.cpp
@@ -1361,7 +1361,7 @@ int CHFGrunt :: ISoundMask ( void)
 //=========================================================
 void CHFGrunt :: CheckAmmo ( void )
 {
-	if ( m_cAmmoLoaded <= 0 )
+	if ( pev->weapons != 0 && m_cAmmoLoaded <= 0 )
 	{
 		SetConditions(bits_COND_NO_AMMO_LOADED);
 	}
@@ -1530,7 +1530,7 @@ BOOL CHFGrunt :: CheckMeleeAttack1 ( float flDot, float flDist )
 //=========================================================
 BOOL CHFGrunt :: CheckRangeAttack1 ( float flDot, float flDist )
 {
-	if ( !HasConditions( bits_COND_ENEMY_OCCLUDED ) && flDist <= 2048 && flDot >= 0.5 && NoFriendlyFire() && ( GetBodygroup( 3 ) != 3 ) )
+	if ( !HasConditions( bits_COND_ENEMY_OCCLUDED ) && flDist <= 2048 && flDot >= 0.5 && NoFriendlyFire() && GetBodygroup( FG_GUN_GROUP ) != FG_GUN_NONE )
 	{
 		TraceResult	tr;
 
@@ -1991,33 +1991,38 @@ void CHFGrunt :: Spawn()
 		{
 			m_iHead = RANDOM_LONG(FG_HEAD_SAW, FG_HEAD_SAW_BLACK);
 		}
+		else if (pev->weapons == 0)
+		{
+			m_iHead = FG_HEAD_MP;
+		}
 		else
 			m_iHead = FG_HEAD_MASK;
 	}
 	else if ( m_iHead >= FG_HEAD_COUNT )
 		m_iHead = FG_HEAD_MASK;
 
-	if ( pev->weapons <= 0 )
+	if (FBitSet( pev->weapons, FGRUNT_9MMAR ))
 	{
-		pev->weapons = FGRUNT_9MMAR;
+		SetBodygroup( FG_GUN_GROUP, FG_GUN_MP5 );
+		m_cClipSize	= FGRUNT_CLIP_SIZE;
 	}
-	if (FBitSet( pev->weapons, FGRUNT_SHOTGUN ))
+	else if (FBitSet( pev->weapons, FGRUNT_SHOTGUN ))
 	{
 		SetBodygroup( FG_GUN_GROUP, FG_GUN_SHOTGUN );
 		SetBodygroup( FG_TORSO_GROUP, FG_TORSO_SHOTGUN );
 		m_cClipSize		= 8;
 	}
-	if (FBitSet( pev->weapons, FGRUNT_9MMAR ))
-	{
-		SetBodygroup( FG_GUN_GROUP, FG_GUN_MP5 );
-		m_cClipSize	= FGRUNT_CLIP_SIZE;
-	}
-	if (FBitSet( pev->weapons, FGRUNT_M249 ))
+	else if (FBitSet( pev->weapons, FGRUNT_M249 ))
 	{
 		SetBodygroup( FG_GUN_GROUP, FG_GUN_SAW );
 		SetBodygroup( FG_TORSO_GROUP, FG_TORSO_M249 );
 		m_cClipSize	= FGRUNT_CLIP_SIZE;
 	}
+	else
+	{
+		SetBodygroup( FG_GUN_GROUP, FG_GUN_NONE );
+		m_cClipSize = 0;
+	}
 
 	SetBodygroup( FG_HEAD_GROUP, m_iHead );
 
@@ -2372,7 +2377,7 @@ Schedule_t* CHFGrunt :: GetScheduleOfType ( int Type )
 		break;
 	case SCHED_HGRUNT_ALLY_ELOF_FAIL:
 		{
-			return GetScheduleOfType( SCHED_RANGE_ATTACK1 );
+			return GetScheduleOfType( SCHED_TAKE_COVER_FROM_ENEMY );
 		}
 		break;
 	case SCHED_HGRUNT_ALLY_ESTABLISH_LINE_OF_FIRE: