Merge branch 'reactivedrop_beta' of https://github.com/ReactiveDrop/reactivedrop_public_src into reactivedrop_beta

Author: GmaOrange

src/game/server/baseentity.cpp

@@ -7279,7 +7279,20 @@ void CBaseEntity::InputRunScriptFile( inputdata_t& inputdata )
 //---------------------------------------------------------
 void CBaseEntity::InputRunScript( inputdata_t& inputdata )
 {
-	RunScript( inputdata.value.String(), "InputRunScript" );
+	const char *pszRawScriptCode = inputdata.value.String();
+
+	const int nRawScriptCodeLen = V_strlen( pszRawScriptCode );
+	const int nRawScriptCodeSize = nRawScriptCodeLen + 1;
+
+	CUtlString szScriptCode;
+	szScriptCode.SetLength( nRawScriptCodeLen );
+	if ( V_StrSubst( inputdata.value.String(), "`", "\"", szScriptCode.Get(), nRawScriptCodeSize, true ) )
+	{
+		RunScript( szScriptCode.Get(), "InputRunScript" );
+		return;
+	}
+	
+	RunScript( pszRawScriptCode, "InputRunScript" );
 }
 
 //---------------------------------------------------------

src/game/server/swarm/asw_marine.cpp

@@ -1419,6 +1419,11 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )
 				Msg( "  but all ignored, since it's from a team mate\n" );
 			return 0;
 		}
+		//make hornet and smart bomb no longer friendlyfire	
+		else if (!ASWDeathmatchMode() && pWeapon && (pWeapon->Classify() == CLASS_ASW_HORNET_BARRAGE || pWeapon->Classify() == CLASS_ASW_SMART_BOMB))
+			{
+    			return 0;
+			}			
 		else
 		{
 			if ( newInfo.GetDamageType() & DMG_CLUB )