From 75258d19f9d0c133aa88ac8ac6c4d3a7cfd426cc Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Thu, 25 May 2017 21:39:22 +0500
Subject: [PATCH] Merge
 https://github.com/malortie/halflife/commit/c8acbf8cd19abd1cbd61f1590e5974a4f180cb06

---
 dlls/apache.cpp          | 2 +-
 dlls/hgrunt.cpp          | 4 ++++
 dlls/hunger/chaingun.cpp | 8 +++++---
 dlls/weapons.h           | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/apache.cpp b/dlls/apache.cpp
index 54c784d1..538d56ea 100644
--- a/dlls/apache.cpp
+++ b/dlls/apache.cpp
@@ -88,7 +88,7 @@ void CApache::Spawn( void )
 		pev->nextthink = gpGlobals->time + 1.0;
 	}
 
-	m_iRockets = 10;
+	m_iRockets = 0;
 }
 
 void CApache::Precache( void )
diff --git a/dlls/hgrunt.cpp b/dlls/hgrunt.cpp
index 7ce0bdb9..43023084 100644
--- a/dlls/hgrunt.cpp
+++ b/dlls/hgrunt.cpp
@@ -186,6 +186,10 @@ enum
 //=========================================================
 void CHGrunt::SpeakSentence( void )
 {
+	// Prevent Cyberfranklin from emitting Grunt taunt sounds. 
+	if( FClassnameIs( pev, "monster_th_cyberfranklin" ) )
+		return;
+
 	if( m_iSentence == HGRUNT_SENT_NONE )
 	{
 		// no sentence cued up.
diff --git a/dlls/hunger/chaingun.cpp b/dlls/hunger/chaingun.cpp
index 6140a40f..8f454ade 100644
--- a/dlls/hunger/chaingun.cpp
+++ b/dlls/hunger/chaingun.cpp
@@ -22,6 +22,8 @@
 #include "player.h"
 #include "gamerules.h"
 
+#define CHAINGUN_BULLETS_PER_SHOT 2
+
 enum chaingun_e {
 	CHAINGUN_IDLE = 0,
 	CHAINGUN_IDLE2,
@@ -357,7 +359,7 @@ void CChaingun::Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
 	m_pPlayer->m_iWeaponVolume = NORMAL_GUN_VOLUME;
 	m_pPlayer->m_iWeaponFlash = NORMAL_GUN_FLASH;
 
-	m_iClip--;
+	m_iClip -= CHAINGUN_BULLETS_PER_SHOT;
 
 	m_pPlayer->pev->effects = (int)(m_pPlayer->pev->effects) | EF_MUZZLEFLASH;
 
@@ -368,7 +370,7 @@ void CChaingun::Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
 	Vector vecAiming = m_pPlayer->GetAutoaimVector(AUTOAIM_5DEGREES);
 	Vector vecDir;
 
-	vecDir = m_pPlayer->FireBulletsPlayer(1, vecSrc, vecAiming, Vector(flSpread, flSpread, flSpread), 8192, BULLET_PLAYER_CHAINGUN, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed);
+	vecDir = m_pPlayer->FireBulletsPlayer(CHAINGUN_BULLETS_PER_SHOT, vecSrc, vecAiming, Vector(flSpread, flSpread, flSpread), 8192, BULLET_PLAYER_CHAINGUN, 2, 0, m_pPlayer->pev, m_pPlayer->random_seed);
 
 	int flags;
 #if defined( CLIENT_WEAPONS )
@@ -393,4 +395,4 @@ void CChaingun::StopSounds(void)
 	STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan2.wav");
 	STOP_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/asscan3.wav");
 	STOP_SOUND(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/asscan4.wav");
-}
\ No newline at end of file
+}
diff --git a/dlls/weapons.h b/dlls/weapons.h
index 87973fae..c25bdbc5 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -163,7 +163,7 @@ public:
 #define TRIPMINE_MAX_CLIP		WEAPON_NOCLIP
 #define SNARK_MAX_CLIP			WEAPON_NOCLIP
 #define AP9_MAX_CLIP			40
-#define TAURUS_MAX_CLIP			10
+#define TAURUS_MAX_CLIP			20
 #define SNIPER_MAX_CLIP			5
 #define CHAINGUN_MAX_CLIP		100
 #define MEDKIT_MAX_CLIP			WEAPON_NOCLIP
@@ -185,7 +185,7 @@ public:
 #define SNARK_DEFAULT_GIVE			5
 #define HIVEHAND_DEFAULT_GIVE		8
 #define AP9_DEFAULT_GIVE			40
-#define TAURUS_DEFAULT_GIVE			10
+#define TAURUS_DEFAULT_GIVE			20
 #define SNIPER_DEFAULT_GIVE			5
 #define CHAINGUN_DEFAULT_GIVE			100
 #define MEDKIT_DEFAULT_GIVE			12